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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-20 00:15:14 -0800 (Fri, 20 Jan 2006)
New Revision: 2449

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/daemon.c
Log:
Small code cleanups.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-01-20 08:09:40 UTC (rev 2448)
+++ trunk/notification-daemon/ChangeLog	2006-01-20 08:15:14 UTC (rev 2449)
@@ -1,3 +1,8 @@
+Fri Jan 20 00:15:04 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon.c:
+	  - Small code cleanups.
+
 Fri Jan 20 00:09:12 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-20 08:09:40 UTC (rev 2448)
+++ trunk/notification-daemon/src/daemon.c	2006-01-20 08:15:14 UTC (rev 2449)
@@ -241,25 +241,19 @@
 	NotifyTimeout *nt = (NotifyTimeout *)value;
 	gboolean *phas_more_timeouts = (gboolean *)data;
 	GTimeVal now;
-	GTimeVal expiration;
 
 	if (!nt->has_timeout)
 		return FALSE;
 
 	g_get_current_time(&now);
-	expiration = nt->expiration;
 
-	if (now.tv_sec > expiration.tv_sec)
+	if (now.tv_sec > nt->expiration.tv_sec ||
+		(now.tv_sec == nt->expiration.tv_sec &&
+		 now.tv_usec >= nt->expiration.tv_usec))
 	{
 		_emit_closed_signal(G_OBJECT(nt->nw));
 		return TRUE;
 	}
-	else if (now.tv_sec == expiration.tv_sec &&
-			 now.tv_usec > expiration.tv_usec)
-	{
-		_emit_closed_signal(G_OBJECT(nt->nw));
-		return TRUE;
-	}
 
 	*phas_more_timeouts = TRUE;