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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2008-09-25 18:52:25 -0700 (Thu, 25 Sep 2008)
New Revision: 3016

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/capplet/notification-properties.c
Log:
Some bullet-proofing to prevent crashes with multiple preview notifications.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2008-09-26 01:51:01 UTC (rev 3015)
+++ trunk/notification-daemon/ChangeLog	2008-09-26 01:52:25 UTC (rev 3016)
@@ -1,3 +1,9 @@
+Thu Sep 25 18:52:05 PDT 2008  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/capplet/notification-properties.c:
+	  - Some bullet-proofing to prevent crashes with multiple preview
+	    notifications.
+
 Thu Sep 25 18:25:36 PDT 2008  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon/daemon.c:

Modified: trunk/notification-daemon/src/capplet/notification-properties.c
===================================================================
--- trunk/notification-daemon/src/capplet/notification-properties.c	2008-09-26 01:51:01 UTC (rev 3015)
+++ trunk/notification-daemon/src/capplet/notification-properties.c	2008-09-26 01:52:25 UTC (rev 3016)
@@ -406,8 +406,10 @@
 notification_properties_dialog_preview_closed(NotifyNotification *preview,
 											  NotificationAppletDialog *dialog)
 {
-	g_object_unref(dialog->preview);
-	dialog->preview = NULL;
+	if (preview == dialog->preview)
+		dialog->preview = NULL;
+
+	g_object_unref(preview);
 }
 
 static void
@@ -415,13 +417,10 @@
 {
 	GError *error;
 
-	if (!notify_is_initted())
+	if (!notify_is_initted() && !notify_init("n-d"))
 	{
-		if (!notify_init("n-d"))
-		{
-			show_message(dialog, _("Error initializing libnotify"));
-			return;
-		}
+		show_message(dialog, _("Error initializing libnotify"));
+		return;
 	}
 
 	error = NULL;