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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-07-29 03:14:57 -0700 (Sat, 29 Jul 2006)
New Revision: 2883

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/NEWS
   trunk/notification-daemon/src/daemon.c
Log:
Patch by Ed Catmur to handle the case where a replaces_id of a non-existant notification was set. Under this case, we now generate a new ID and send it back in the notification, rather than creating a broken notification. This closes ticket #76.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-07-29 10:06:22 UTC (rev 2882)
+++ trunk/notification-daemon/ChangeLog	2006-07-29 10:14:57 UTC (rev 2883)
@@ -1,3 +1,11 @@
+Sat Jul 29 03:11:15 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon.c:
+	  - Patch by Ed Catmur to handle the case where a replaces_id of a
+	    non-existant notification was set. Under this case, we now generate a
+	    new ID and send it back in the notification, rather than creating a
+	    broken notification. This closes ticket #76.
+
 Sat Jul 29 02:43:25 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon.c:

Modified: trunk/notification-daemon/NEWS
===================================================================
--- trunk/notification-daemon/NEWS	2006-07-29 10:06:22 UTC (rev 2882)
+++ trunk/notification-daemon/NEWS	2006-07-29 10:14:57 UTC (rev 2883)
@@ -7,6 +7,12 @@
 	  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)
+	* Fixed type validation for raw icon data. Patch by Ed Catmur.
+	  (Bugs #75, #67)
+	* Fixed a problem where a replaces_id that points to a non-existant
+	  notification would cause a broken notification where timeouts and
+	  action invoking fails. In this case, a new ID is generated. Patch by
+	  Ed Catmur. (Bug #76)
 	* 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-29 10:06:22 UTC (rev 2882)
+++ trunk/notification-daemon/src/daemon.c	2006-07-29 10:14:57 UTC (rev 2883)
@@ -925,6 +925,8 @@
 
 		if (nt != NULL)
 			nw = nt->nw;
+		else
+			id = 0;
 	}
 
 	if (nw == NULL)