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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-19 10:18:23 -0800 (Thu, 19 Jan 2006)
New Revision: 2437

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/daemon.c
Log:
Simplify a small piece of logic.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-01-19 10:38:02 UTC (rev 2436)
+++ trunk/notification-daemon/ChangeLog	2006-01-19 18:18:23 UTC (rev 2437)
@@ -1,3 +1,8 @@
+Thu Jan 19 10:18:09 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon.c:
+	  - Simplify a small piece of logic.
+
 Thu Jan 19 02:37:31 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon.c:

Modified: trunk/notification-daemon/src/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon.c	2006-01-19 10:38:02 UTC (rev 2436)
+++ trunk/notification-daemon/src/daemon.c	2006-01-19 18:18:23 UTC (rev 2437)
@@ -646,17 +646,12 @@
 	{
 		nt = (NotifyTimeout *)g_hash_table_lookup(priv->notification_hash,
 												  &id);
+		nw = nt->nw;
 	}
-
-	if (nt == NULL)
+	else
 	{
 		nw = theme_create_notification();
-		id = 0;
 	}
-	else
-	{
-		nw = nt->nw;
-	}
 
 	theme_set_notification_text(nw, summary, body);