[gaim-migrate @ 13869]

Mon, 03 Oct 2005 06:39:49 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Mon, 03 Oct 2005 06:39:49 +0000
changeset 11599
431352c132c8
parent 11598
7d18b6a35746
child 11600
18af42c33b41

[gaim-migrate @ 13869]
Sadrul says this helps the menu tray crash, and see my comment in the file...

src/gtkmenutray.c file | annotate | diff | comparison | revisions
src/gtkmenutray.h file | annotate | diff | comparison | revisions
--- a/src/gtkmenutray.c	Mon Oct 03 05:54:06 2005 +0000
+++ b/src/gtkmenutray.c	Mon Oct 03 06:39:49 2005 +0000
@@ -79,9 +79,17 @@
 
 static void
 gaim_gtk_menu_tray_finalize(GObject *obj) {
+#if 0
+	/* This _might_ be leaking, but I have a sneaking suspicion that the widget is
+	 * getting destroyed in GtkContainer's finalize function.  But if were are
+	 * leaking here, be sure to figure out why this causes a crash.
+	 *	-- Gary
+	 */
 	GaimGtkMenuTray *tray = GAIM_GTK_MENU_TRAY(obj);
+
 	if(GTK_IS_WIDGET(tray->tray))
 		gtk_widget_destroy(GTK_WIDGET(tray->tray));
+#endif
 
 	G_OBJECT_CLASS(parent_class)->finalize(obj);
 }
--- a/src/gtkmenutray.h	Mon Oct 03 05:54:06 2005 +0000
+++ b/src/gtkmenutray.h	Mon Oct 03 06:39:49 2005 +0000
@@ -39,7 +39,7 @@
 /** A GaimGtkMenuTray */
 struct _GaimGtkMenuTray {
 	GtkMenuItem gparent;					/**< The parent instance */
-	GtkWidget *tray;					/**< The tray */
+	GtkWidget *tray;						/**< The tray */
 };
 
 /** A GaimGtkMenuTrayClass */

mercurial