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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-06-24 20:51:34 -0700 (Fri, 24 Jun 2005)
New Revision: 1981

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/main.cpp
Log:
Patch #3614 by Duarte Henriques to support using old handles that have already timed out.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2005-06-24 04:01:51 UTC (rev 1980)
+++ trunk/notification-daemon/ChangeLog	2005-06-25 03:51:34 UTC (rev 1981)
@@ -1,3 +1,9 @@
+Fri Jun 24 20:49:06 PDT 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/main.cpp:
+	  - Patch #3614 by Duarte Henriques to support using old handles that
+	    have already timed out.
+
 Mon Jun 20 06:14:07 PDT 2005  Christian Hammond <chipx86 at gnupdate.org>
 
 	* src/BaseNotification.cpp:

Modified: trunk/notification-daemon/src/main.cpp
===================================================================
--- trunk/notification-daemon/src/main.cpp	2005-06-24 04:01:51 UTC (rev 1980)
+++ trunk/notification-daemon/src/main.cpp	2005-06-25 03:51:34 UTC (rev 1981)
@@ -116,8 +116,9 @@
     _notifyd_dbus_message_iter_get_uint32(&iter, replaces);
     dbus_message_iter_next(&iter);
 
-    if (replaces == 0)
+    if (replaces == 0 || (n = backend->get(replaces)) == NULL)
     {
+        replaces = 0;
         n = backend->create_notification();
         n->connection = incoming;
 
@@ -126,10 +127,6 @@
     else
     {
         TRACE("replaces = %d\n", replaces);
-
-        n = backend->get(replaces);
-        validate(n != NULL, NULL, "Invalid replacement ID (%d) given\n",
-                 replaces );
     }
 
     validate(n->connection != NULL, NULL,