pidgin.2.5.6: 2a352184: *** Plucked rev 143e16e9 (sadrul at pidgin....

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 2a35218412842ba07897cde95941adafb3543dec
Ancestor: 61ece5c7356237996290e900dd37c32a4dd81d3e
Author: sadrul at pidgin.im
Date: 2009-04-30T14:02:33
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/2a35218412842ba07897cde95941adafb3543dec

Modified files:
        COPYRIGHT finch/gntblist.c finch/plugins/gntgf.c

ChangeLog: 

*** Plucked rev 143e16e9 (sadrul at pidgin.im):
Save the world.

Patch from Arunan Bala to save the world. But instead of saving the
cheerleader, he's using g_timeout_add_seconds where possible in place of
g_timeout_add. Closes #8831.

*** Plucked rev 4a4ac072 (sadrul at pidgin.im):
Update the copyright name, as requested.

*** Plucked rev 91e51efe (sadrul at pidgin.im):
Update the finch manual some. Refs #8577.


-------------- next part --------------
============================================================
--- COPYRIGHT	367b63e9a12eca980e28cea0f3878843ba96f8c3
+++ COPYRIGHT	606a4dbde913230da608b3b8b61607f7759b0f98
@@ -19,6 +19,7 @@ John Bailey
 Christopher Ayoup
 Alex Badea
 John Bailey
+Arunan Balasubramaniam
 R. Tyler Ballance
 Chris Banal
 Luca Barbato
============================================================
--- finch/gntblist.c	34ed1218ec900bf08108f0055155f2e222a7036a
+++ finch/gntblist.c	75bf2e0227cadb96cdaae394bdfe38acf776b848
@@ -61,7 +61,7 @@
 #include <string.h>
 
 #define PREF_ROOT "/finch/blist"
-#define TYPING_TIMEOUT 4000
+#define TYPING_TIMEOUT_S 4
 
 #define SHOW_EMPTY_GROUP_TIMEOUT  60
 
@@ -2012,7 +2012,7 @@ reset_blist_window(GntWidget *window, gp
 	}
 
 	if (ggblist->typing)
-		g_source_remove(ggblist->typing);
+		purple_timeout_remove(ggblist->typing);
 	remove_peripherals(ggblist);
 	if (ggblist->tagged)
 		g_list_free(ggblist->tagged);
@@ -2249,7 +2249,7 @@ end:
 end:
 	g_free(escnewmessage);
 	if (ggblist->typing)
-		g_source_remove(ggblist->typing);
+		purple_timeout_remove(ggblist->typing);
 	ggblist->typing = 0;
 	return FALSE;
 }
@@ -2268,7 +2268,7 @@ status_selection_changed(GntComboBox *bo
 		/* Move the focus to the entry box */
 		/* XXX: Make sure the selected status can have a message */
 		gnt_box_move_focus(GNT_BOX(ggblist->window), 1);
-		ggblist->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, NULL);
+		ggblist->typing = purple_timeout_add_seconds(TYPING_TIMEOUT_S, (GSourceFunc)remove_typing_cb, NULL);
 	}
 	else if (now->type == STATUS_SAVED_ALL)
 	{
@@ -2294,7 +2294,7 @@ status_text_changed(GntEntry *entry, con
 		return FALSE;
 
 	if (ggblist->typing)
-		g_source_remove(ggblist->typing);
+		purple_timeout_remove(ggblist->typing);
 	ggblist->typing = 0;
 
 	if (text[0] == '\r' && text[1] == 0)
@@ -2304,7 +2304,7 @@ status_text_changed(GntEntry *entry, con
 		return TRUE;
 	}
 
-	ggblist->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, NULL);
+	ggblist->typing = purple_timeout_add_seconds(TYPING_TIMEOUT_S, (GSourceFunc)remove_typing_cb, NULL);
 	return FALSE;
 }
 
============================================================
--- finch/plugins/gntgf.c	9101f962dc5d790f51527ce2a615b925f817dc15
+++ finch/plugins/gntgf.c	d676156ca7a1204b440e9ff8cbc3b28cbe4fa707
@@ -47,6 +47,7 @@
 #include <blist.h>
 #include <conversation.h>
 #include <debug.h>
+#include <eventloop.h>
 #include <util.h>
 
 #include <gnt.h>
@@ -75,7 +76,7 @@ destroy_toaster(GntToast *toast)
 {
 	toasters = g_list_remove(toasters, toast);
 	gnt_widget_destroy(toast->window);
-	g_source_remove(toast->timer);
+	purple_timeout_remove(toast->timer);
 	g_free(toast);
 }
 
@@ -220,7 +221,7 @@ notify(PurpleConversation *conv, const c
 	}
 	gnt_widget_draw(window);
 
-	toast->timer = g_timeout_add(4000, (GSourceFunc)remove_toaster, toast);
+	toast->timer = purple_timeout_add_seconds(4, (GSourceFunc)remove_toaster, toast);
 	toasters = g_list_prepend(toasters, toast);
 }