~prateek.karandikar/ubuntu/precise/pidgin/add_quicklist

« back to all changes in this revision

Viewing changes to finch/libgnt/gntmain.c

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2011-04-11 03:27:22 UTC
  • mfrom: (2.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20110411032722-farsw08i6ouj5dnd
Tags: 1:2.7.11-1ubuntu1
* Merge from Debian unstable (LP: #757146), remaining changes:
  + debian/control:
    - Add libtool and liblaunchpad-integration-dev build depends
    - Bump standards version
    - Relax binary depends on pidgin versions
    - Add pidgin-libnotify as Recommends for pidgin binary
    - Fix description of pidgin binary
    - Don't have libpurple-bin depend on libpurple0
  + debian/libpurple0.symbols: add epoch to appropriate symbols
  + Add debian/patches:
    - 02_lpi.patch
    - 04_let_crasher_for_apport.patch
    - 05_default_to_irc_ubuntu_com.patch
    - 10_docklet_default_off.patch
    - 11_buddy_list_really_show.patch
    - 13_sounds_and_timers.patch
    - 60_1024x600_gtkpounce.c.patch
    - 60_1024x600_gtkprefs.c.patch
  + debian/prefs.xml: add notification prefs
  + debian/rules:
    - Add translation domain to desktop file with gettext
    - Add the launcher for pidgin

* Add configure check for launchpad integration attached to the gtk check since 
  upstream dropped the startup notification check which is where this check was 
  previously
  - update debian/patches/02_lpi.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
126
126
 
127
127
        if (!wm->cws->ordered || buffer[0] != 27)
128
128
                return FALSE;
129
 
        
 
129
 
130
130
        buffer++;
131
131
        if (strlen(buffer) < 5)
132
132
                return FALSE;
177
177
 
178
178
        if (widget && gnt_wm_process_click(wm, event, x, y, widget))
179
179
                return TRUE;
180
 
        
 
180
 
181
181
        if (event == GNT_LEFT_MOUSE_DOWN && widget && widget != wm->_list.window &&
182
182
                        !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_TRANSIENT)) {
183
183
                if (widget != wm->cws->ordered->data) {
438
438
{
439
439
        const char *name = gnt_style_get(GNT_STYLE_WM);
440
440
        gpointer handle;
441
 
        
 
441
 
442
442
        if (name && *name) {
443
443
                handle = g_module_open(name, G_MODULE_BIND_LAZY);
444
444
                if (handle) {
459
459
 
460
460
        if (channel)
461
461
                return;
462
 
        
 
462
 
463
463
        locale = setlocale(LC_ALL, "");
464
464
 
465
465
        setup_io();
554
554
        GntWidget *w;
555
555
        if (!widget)
556
556
                return FALSE;
557
 
        
 
557
 
558
558
        if (GNT_IS_MENU(widget))
559
559
                return TRUE;
560
560