[Galago-commits] r2899 - in trunk/libnotify: . libnotify

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-09-03 23:49:15 -0700 (Sun, 03 Sep 2006)
New Revision: 2899

Modified:
   trunk/libnotify/ChangeLog
   trunk/libnotify/NEWS
   trunk/libnotify/libnotify/notification.c
Log:
Patch by lucasr to fix an invalid assertion in notify_notification_new_with_status_icon. This closes bug #85.


Modified: trunk/libnotify/ChangeLog
===================================================================
--- trunk/libnotify/ChangeLog	2006-09-04 06:45:34 UTC (rev 2898)
+++ trunk/libnotify/ChangeLog	2006-09-04 06:49:15 UTC (rev 2899)
@@ -1,3 +1,10 @@
+Sun Sep 03 23:48:29 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libnotify/notification.c:
+	* NEWS:
+	  - Patch by lucasr to fix an invalid assertion in
+	    notify_notification_new_with_status_icon. This closes bug #85.
+
 Sun Sep 03 23:44:01 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libnotify/notify.c:

Modified: trunk/libnotify/NEWS
===================================================================
--- trunk/libnotify/NEWS	2006-09-04 06:45:34 UTC (rev 2898)
+++ trunk/libnotify/NEWS	2006-09-04 06:49:15 UTC (rev 2899)
@@ -9,6 +9,8 @@
 	* Fixed the property change notification used when setting a GtkStatusIocn.
 	  It was emitting "attach-icon" but should have been emitted "status-icon".
 	  (Bug #81)
+	* Fixed an invalid assertion in notify_notification_new_with_status_icon.
+	  Patch by lucasr. (Bug #85)
 	* notify_uninit is no longer called automatically at exit. Applications
 	  and libraries should do this manually. Patch by berndth. (Bug #86)
 

Modified: trunk/libnotify/libnotify/notification.c
===================================================================
--- trunk/libnotify/libnotify/notification.c	2006-09-04 06:45:34 UTC (rev 2898)
+++ trunk/libnotify/libnotify/notification.c	2006-09-04 06:49:15 UTC (rev 2899)
@@ -502,7 +502,7 @@
                                          const gchar *icon,
                                          GtkStatusIcon *status_icon)
 {
-	g_return_val_if_fail(status_icon == NULL, NULL);
+	g_return_val_if_fail(status_icon != NULL, NULL);
 	g_return_val_if_fail(GTK_IS_STATUS_ICON(status_icon), NULL);
 
 	return g_object_new(NOTIFY_TYPE_NOTIFICATION,