# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1185608393 0
# Node ID d36aceb74a46594bab49f3374670fbaa56d8b2ff
# Parent  1afeca132d688ecf6dc9057854c500884b1dfdd5# Parent  c77cf4e8eb659ade05f34de478e13f17e1d82570
merge of '510f7cd6a9eb8873d3b1e96a58533109ed155792'
     and '79a90077f8beb0d985f5bf0a6d4de25d639027be'

diff -r 1afeca132d68 -r d36aceb74a46 pidgin/gtkdocklet.c
diff -r 1afeca132d68 -r d36aceb74a46 pidgin/gtklog.c
diff -r 1afeca132d68 -r d36aceb74a46 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Sat Jul 28 05:37:02 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Sat Jul 28 07:39:53 2007 +0000
@@ -1016,8 +1016,8 @@
 	}
 }
 
-static gboolean
-pidgin_status_box_regenerate_real(PidginStatusBox *status_box)
+static void
+pidgin_status_box_regenerate(PidginStatusBox *status_box)
 {
 	GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4, *pixbuf5;
 	GtkIconSize icon_size;
@@ -1081,21 +1081,11 @@
 	}
 	gtk_tree_view_set_model(GTK_TREE_VIEW(status_box->tree_view), GTK_TREE_MODEL(status_box->dropdown_store));
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(status_box->tree_view), TEXT_COLUMN);
-
-	return FALSE;
-}
-
-static void
-pidgin_status_box_regenerate(PidginStatusBox *status_box)
-{
-	/* we have to do this in a timeout, so we avoid recursing
-	 * to infinity (and beyond) */
-	purple_timeout_add(0, (GSourceFunc)pidgin_status_box_regenerate_real, status_box);
 }
 
 static gboolean combo_box_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, GtkIMHtml *imhtml)
 {
-	pidgin_status_box_popup(PIDGIN_STATUS_BOX(w));
+  	pidgin_status_box_popup(PIDGIN_STATUS_BOX(w));
 	return TRUE;
 }