[Galago-commits] r2993 - in trunk/notification-daemon: . src/themes/standard

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2007-08-25 19:11:23 -0700 (Sat, 25 Aug 2007)
New Revision: 2993

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/themes/standard/theme.c
Log:
Only set the urgency in the standard theme if the value is actually a uchar. We were assuming it would be, but that made it easy to crash things. Now we make sure. Fixes bug #135.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2007-08-26 02:10:17 UTC (rev 2992)
+++ trunk/notification-daemon/ChangeLog	2007-08-26 02:11:23 UTC (rev 2993)
@@ -1,3 +1,10 @@
+Sat Aug 25 19:10:18 PDT 2007  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/themes/standard/theme.c:
+	  - Only set the urgency in the standard theme if the value is actually a
+	    uchar. We were assuming it would be, but that made it easy to crash
+	    things. Now we make sure. Fixes bug #135.
+
 Sat Aug 25 18:55:34 PDT 2007  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon/daemon.c:

Modified: trunk/notification-daemon/src/themes/standard/theme.c
===================================================================
--- trunk/notification-daemon/src/themes/standard/theme.c	2007-08-26 02:10:17 UTC (rev 2992)
+++ trunk/notification-daemon/src/themes/standard/theme.c	2007-08-26 02:11:23 UTC (rev 2993)
@@ -752,7 +752,7 @@
 
 	value = (GValue *)g_hash_table_lookup(hints, "urgency");
 
-	if (value != NULL)
+	if (value != NULL && G_VALUE_HOLDS_UCHAR(value))
 	{
 		windata->urgency = g_value_get_uchar(value);