[Xfce4-commits] r26625 - xfce4-panel/trunk/plugins/clock

[Nick Schermer]

Author: nick
Date: 2008-02-18 07:59:29 +0000 (Mon, 18 Feb 2008)
New Revision: 26625

Modified:
   xfce4-panel/trunk/plugins/clock/clock.c
Log:
* Fix another NULL case in the clock, path by Enrico Troger


Modified: xfce4-panel/trunk/plugins/clock/clock.c
===================================================================
--- xfce4-panel/trunk/plugins/clock/clock.c	2008-02-18 01:37:26 UTC (rev 26624)
+++ xfce4-panel/trunk/plugins/clock/clock.c	2008-02-18 07:59:29 UTC (rev 26625)
@@ -124,7 +124,7 @@
     guint        interval = CLOCK_INTERVAL_HOUR;
 
     if (G_UNLIKELY (format == NULL))
-      return CLOCK_INTERVAL_HOUR;
+        return CLOCK_INTERVAL_HOUR;
 
     for (p = format; *p != '\0'; ++p)
     {
@@ -231,7 +231,8 @@
     static GtkTooltips *tooltips = NULL;
     struct tm           tm;
 
-    g_return_val_if_fail (clock->tooltip_format != NULL, TRUE);
+    if (G_UNLIKELY (clock->tooltip_format == NULL))
+        return TRUE;
 
     /* allocate the tooltip on-demand */
     if (G_UNLIKELY (tooltips == NULL))