← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to debian/patches/13_sounds_and_timers.patch

  • 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:
debian/patches/13_sounds_and_timers.patch
1
 
=== modified file 'pidgin/gtkblist.c'
2
 
--- old/pidgin/gtkblist.c       2009-03-09 23:42:38 +0000
3
 
+++ new/pidgin/gtkblist.c       2009-03-25 14:31:54 +0000
4
 
@@ -5645,7 +5645,7 @@
5
 
        purple_blist_set_visible(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible"));
6
 
 
7
 
        /* start the refresh timer */
8
 
-       gtkblist->refresh_timer = g_timeout_add(30000, (GSourceFunc)pidgin_blist_refresh_timer, list);
9
 
+       gtkblist->refresh_timer = g_timeout_add_seconds(30, (GSourceFunc)pidgin_blist_refresh_timer, list);
10
 
 
11
 
        handle = pidgin_blist_get_handle();
12
 
 
13
 
@@ -5766,7 +5766,7 @@
14
 
        blist = purple_get_blist();
15
 
        gtkblist = PIDGIN_BLIST(purple_get_blist());
16
 
 
17
 
-       gtkblist->refresh_timer = g_timeout_add(30000,(GSourceFunc)pidgin_blist_refresh_timer, blist);
18
 
+       gtkblist->refresh_timer = g_timeout_add_seconds(30,(GSourceFunc)pidgin_blist_refresh_timer, blist);
19
 
 }
20
 
 
21
 
 static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter) {
22
 
@@ -7187,7 +7187,7 @@
23
 
 
24
 
        if(gtknode->recent_signonoff_timer > 0)
25
 
                purple_timeout_remove(gtknode->recent_signonoff_timer);
26
 
-       gtknode->recent_signonoff_timer = purple_timeout_add(10000,
27
 
+       gtknode->recent_signonoff_timer = purple_timeout_add_seconds(10,
28
 
                        (GSourceFunc)buddy_signonoff_timeout_cb, buddy);
29
 
 }
30
 
 
31
 
 
32
1
=== modified file 'pidgin/gtksound.c'
33
2
--- old/pidgin/gtksound.c       2009-01-09 16:53:41 +0000
34
3
+++ new/pidgin/gtksound.c       2009-03-25 14:32:40 +0000
45
14
        if (mute_login_sounds_timeout != 0)
46
15
                g_source_remove(mute_login_sounds_timeout);
47
16
        mute_login_sounds = TRUE;
48
 
-       mute_login_sounds_timeout = purple_timeout_add(10000, unmute_login_sounds_cb, NULL);
 
17
-       mute_login_sounds_timeout = purple_timeout_add_seconds(10, unmute_login_sounds_cb, NULL);
49
18
+       mute_login_sounds_timeout = purple_timeout_add_seconds(15, unmute_login_sounds_cb, NULL);
50
19
 }
51
20