← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to pidgin/gtkdebug.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-09 19:40:26 UTC
  • mfrom: (1.4.1 upstream) (46.1.10 karmic)
  • Revision ID: james.westby@ubuntu.com-20091009194026-wbqqh0bsbz19nx5q
Tags: 1:2.6.2-1ubuntu7
https://launchpad.net/bugs/346840
https://launchpad.net/bugs/209440
* Don't stick the buddy list window to all desktops as some
  window managers have trouble to properly unstick it (LP: #346840)
  - debian/patches/11_buddy_list_really_show.patch
* Always use default tray icon size on KDE (LP: #209440)
  - debian/patches/62_tray_icon_size_kde.patch
* Use scrollbars in the preferences dialog if the screen height is
  below 700 px instead of 600 px
  - debian/patches/60_1024x600_gtkprefs.c.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/gtkdebug.c
94
94
        if(debug_win->timer != 0) {
95
95
                const gchar *text;
96
96
 
97
 
                g_source_remove(debug_win->timer);
 
97
                purple_timeout_remove(debug_win->timer);
98
98
 
99
99
                text = gtk_entry_get_text(GTK_ENTRY(debug_win->expression));
100
100
                purple_prefs_set_string(PIDGIN_PREFS_ROOT "/debug/regex", text);
552
552
        }
553
553
 
554
554
        if(win->timer == 0)
555
 
                win->timer = purple_timeout_add(5000, (GSourceFunc)regex_timer_cb, win);
 
555
                win->timer = purple_timeout_add_seconds(5, (GSourceFunc)regex_timer_cb, win);
556
556
 
557
557
        regex_compile(win);
558
558
}
769
769
                win->filter =
770
770
                        gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
771
771
                                                                           GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
772
 
                                                                           NULL, _("Filter"), _("Filter"), 
 
772
                                                                           NULL, _("Filter"), _("Filter"),
773
773
                                                                           NULL, NULL,
774
774
                                                                           G_CALLBACK(regex_filter_toggled_cb),
775
775
                                                                           win);
821
821
                                           GTK_TOOLBAR_CHILD_WIDGET, gtk_label_new(_("Level ")),
822
822
                                           NULL, _("Select the debug filter level."),
823
823
                                           NULL, NULL, NULL, NULL);
824
 
                
 
824
 
825
825
                win->filterlevel = gtk_combo_box_new_text();
826
826
                gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
827
827
                                           GTK_TOOLBAR_CHILD_WIDGET, win->filterlevel,