org.guifications.plugins: cb7fb29ccf12c16556d71ee84cb33a1bb5f48232

[sadrul at guifications.org]

-----------------------------------------------------------------
Revision: cb7fb29ccf12c16556d71ee84cb33a1bb5f48232
Ancestor: 52c76daaa741c9b92df9acc46713dc9d975d0d79
Author: sadrul at guifications.org
Date: 2007-11-08T18:13:03
Branch: org.guifications.plugins

Modified files:
        convbadger/convbadger.c

ChangeLog: 

Slightly-modified patch from Sadrul that should fix the convbadger crashes.
Refs #436.  Ankit, you probably want to test this.

-----------------------------------------------------------------
This revision's diffstat output:
 convbadger.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
-------------- next part --------------
============================================================
--- convbadger/convbadger.c	252f3e1354c6b6b8e9993c6cd53310eb1ccc06ff
+++ convbadger/convbadger.c	febf539017bf5c318b234520d5d5398400bb123f
@@ -49,11 +49,9 @@ conv_badger_data_free(ConvBadgerData *cb
 	cbd->win = NULL;
 	cbd->conv = NULL;
 
-	if(GTK_IS_IMAGE(cbd->icon))
+	if(cbd->icon && GTK_IS_IMAGE(cbd->icon))
 		gtk_widget_destroy(cbd->icon);
 
-	cbd->icon = NULL;
-
 	g_free(cbd);
 
 	cbd = NULL;
@@ -86,6 +84,9 @@ conv_badger_update(PidginWindow *win, Pu
 		pidgin_menu_tray_append(PIDGIN_MENU_TRAY(win->menu.tray), cbd->icon,
 								NULL);
 		gtk_widget_show(cbd->icon);
+
+		g_signal_connect_swapped(G_OBJECT(cbd->icon), "destroy",
+				G_CALLBACK(g_nullify_pointer), &cbd->icon);
 	}
 
 	cbd->conv = conv;