diff finch/gntblist.c @ 28150:13f555d07a3f

Fix a crash at shutdown in Finch. #0 0x0805cdb8 in reset_blist_window (window=0x8b940d0, null=0x0) at gntblist.c:2011 node = <value optimized out> #1 0xb7bf0dfc in IA__g_cclosure_marshal_VOID__VOID () at gmarshal.c:77 #2 0xb7bd9d72 in g_closure_invoke () from /usr/lib/libgobject-2.0.so.0 #3 0xb7bf061a in signal_emit_unlocked_R () at gsignal.c:3247 #4 0xb7bef94d in IA__g_signal_emit_valist () at gsignal.c:2980 #5 0xb7befc39 in IA__g_signal_emit at gsignal.c:3037 #6 0xb7fec985 in gnt_widget_dispose (obj=0x8b940d0) at gntwidget.c:77 #7 0xb7bdc4cf in g_object_run_dispose () from /usr/lib/libgobject-2.0.so.0 #8 0xb7fec797 in gnt_widget_destroy (obj=0x8b940d0) at gntwidget.c:320 #9 0x0805a579 in finch_blist_uninit () at gntblist.c:3190 #10 0x0807a2a9 in gnt_ui_uninit () at gntui.c:123 #11 0x08069e8b in finch_quit () at finch.c:97

--- a/finch/gntblist.c	Mon Aug 03 18:30:22 2009 +0000
+++ b/finch/gntblist.c	Mon Aug 03 23:29:05 2009 +0000
@@ -589,6 +589,16 @@
 		ggblist->manager = &default_manager;
 }
 
+static void destroy_list(PurpleBuddyList *list)
+{
+	if (ggblist == NULL)
+		return;
+
+	gnt_widget_destroy(ggblist->window);
+	g_free(ggblist);
+	ggblist = NULL;
+}
+
 static gboolean
 remove_new_empty_group(gpointer data)
 {
@@ -849,7 +859,7 @@
 	blist_show,
 	node_update,
 	node_remove,
-	NULL,
+	destroy_list,
 	NULL,
 	finch_request_add_buddy,
 	finch_request_add_chat,
@@ -3184,12 +3194,6 @@
 
 void finch_blist_uninit()
 {
-	if (ggblist == NULL)
-		return;
-
-	gnt_widget_destroy(ggblist->window);
-	g_free(ggblist);
-	ggblist = NULL;
 }
 
 gboolean finch_blist_get_position(int *x, int *y)