[Galago-commits] r2880 - in trunk/notification-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-07-26 23:49:30 -0700 (Wed, 26 Jul 2006)
New Revision: 2880

Modified:
   trunk/notification-daemon/AUTHORS
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/NEWS
   trunk/notification-daemon/src/daemon.c
Log:
Patch by Ed Catmur to fix an assertion failure when destroying a notification caused by gtk_widget_realize() being called somewhere in the destructor chain. This closes ticket #77.


Modified: trunk/notification-daemon/AUTHORS
===================================================================
--- trunk/notification-daemon/AUTHORS	2006-07-13 07:51:10 UTC (rev 2879)
+++ trunk/notification-daemon/AUTHORS	2006-07-27 06:49:30 UTC (rev 2880)
@@ -5,6 +5,7 @@
 Contributors:
 	Rodney Dawes <dobey at novell.com>
 	felix at hsgheli.de
+	Ed Catmur <ed at catmur.co.uk>
 
 Translators:
 	Dutch - Wouter Bolsterlee <uws+gnome at xs4all.nl>

Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-07-13 07:51:10 UTC (rev 2879)
+++ trunk/notification-daemon/ChangeLog	2006-07-27 06:49:30 UTC (rev 2880)
@@ -1,3 +1,11 @@
+Wed Jul 26 23:44:24 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* NEWS:
+	* src/daemon.c:
+	  - Patch by Ed Catmur to fix an assertion failure when destroying a
+	    notification caused by gtk_widget_realize() being called somewhere
+	    in the destructor chain. This closes ticket #77.
+
 Thu Jul 13 00:50:05 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon.c:

Modified: trunk/notification-daemon/NEWS
===================================================================
--- trunk/notification-daemon/NEWS	2006-07-13 07:51:10 UTC (rev 2879)
+++ trunk/notification-daemon/NEWS	2006-07-27 06:49:30 UTC (rev 2880)
@@ -4,6 +4,8 @@
 	  it suddenly disappearing before the user clicks. (Ticket #73)
 	* Fixed a crash under some icon themes where the base size of an icon
 	  was being returned as 0. (Bug #61)
+	* Fixed an assertion failure under newer versions of GTK+ during a
+	  notification's destruction. Patch by Ed Catmur. (Bug #77)
 	* Added a Dutch translation from Wouter Bolsterlee. (Bug #55)
 
 version 0.3.5 (26-April-2006):

Modified: trunk/notification-daemon/src/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon.c	2006-07-13 07:51:10 UTC (rev 2879)
+++ trunk/notification-daemon/src/daemon.c	2006-07-27 06:49:30 UTC (rev 2880)
@@ -716,6 +716,9 @@
 		priv->poptart_stack = g_slist_remove_link(priv->poptart_stack,
 												  remove_link);
 	}
+
+	if (GTK_WIDGET_REALIZED(GTK_WIDGET(nw)))
+		gtk_widget_unrealize(GTK_WIDGET(nw));
 }
 
 static void