[Goodies-commits] r2491 - in xfce4-datetime-plugin/tags/datetime_0_4_3: . panel-plugin

Remco den Breeje stacium at xfce.org
Thu Feb 8 10:50:37 CET 2007


Author: stacium
Date: 2007-02-08 09:50:37 +0000 (Thu, 08 Feb 2007)
New Revision: 2491

Modified:
   xfce4-datetime-plugin/tags/datetime_0_4_3/ChangeLog
   xfce4-datetime-plugin/tags/datetime_0_4_3/configure.in.in
   xfce4-datetime-plugin/tags/datetime_0_4_3/panel-plugin/datetime.c
Log:
* release 0.4.3
    Fix bug where an error is shown after restarting the plugin while a date
    or time format is empty (#2867). Thanks Scott H for reporting.



Modified: xfce4-datetime-plugin/tags/datetime_0_4_3/ChangeLog
===================================================================
--- xfce4-datetime-plugin/tags/datetime_0_4_3/ChangeLog	2007-02-08 09:31:20 UTC (rev 2490)
+++ xfce4-datetime-plugin/tags/datetime_0_4_3/ChangeLog	2007-02-08 09:50:37 UTC (rev 2491)
@@ -1,5 +1,10 @@
+2007-02-08  Remco den Breeje <remco at vioco.nl>
+    * release 0.4.3
+    Fix bug where an error is shown after restarting the plugin while a date
+    or time format is empty (#2867). Thanks Scott H for reporting.
+
 2007-01-21  Remco den Breeje <remco at vioco.nl>
-    * release 0.4.1
+    * release 0.4.2
     Fixed bug where datetime formats read from the config-file are lost
 
 2006-12-19  Nick Schermer <nick at xfce.org>

Modified: xfce4-datetime-plugin/tags/datetime_0_4_3/configure.in.in
===================================================================
--- xfce4-datetime-plugin/tags/datetime_0_4_3/configure.in.in	2007-02-08 09:31:20 UTC (rev 2490)
+++ xfce4-datetime-plugin/tags/datetime_0_4_3/configure.in.in	2007-02-08 09:50:37 UTC (rev 2491)
@@ -1,7 +1,7 @@
 dnl Version information
 m4_define([datetime_version_major], [0])
 m4_define([datetime_version_minor], [4])
-m4_define([datetime_version_micro], [2])
+m4_define([datetime_version_micro], [3])
 m4_define([datetime_version], [datetime_version_major().datetime_version_minor().datetime_version_micro()])
 
 dnl Initialize autoconf

Modified: xfce4-datetime-plugin/tags/datetime_0_4_3/panel-plugin/datetime.c
===================================================================
--- xfce4-datetime-plugin/tags/datetime_0_4_3/panel-plugin/datetime.c	2007-02-08 09:31:20 UTC (rev 2490)
+++ xfce4-datetime-plugin/tags/datetime_0_4_3/panel-plugin/datetime.c	2007-02-08 09:50:37 UTC (rev 2491)
@@ -55,7 +55,9 @@
 
   g_get_current_time(&timeval);
   current = localtime((time_t *)&timeval.tv_sec);
-  if (datetime->date_format != NULL && GTK_IS_LABEL(datetime->date_label))
+  if (datetime->date_format != NULL && 
+      GTK_IS_LABEL(datetime->date_label) &&
+      strlen(datetime->date_format) > 0)
   {
     len = strftime(buf, sizeof(buf) - 1, datetime->date_format, current);
     if (len != 0)
@@ -74,7 +76,9 @@
     }
   }
 
-  if (datetime->time_format != NULL && GTK_IS_LABEL(datetime->time_label))
+  if (datetime->time_format != NULL && 
+      GTK_IS_LABEL(datetime->time_label) &&
+      strlen(datetime->time_format) > 0)
   {
     len = strftime(buf, sizeof(buf) - 1, datetime->time_format, current);
     if (len != 0)
@@ -543,6 +547,9 @@
 
   /* call widget-create function */
   datetime_create_widget(datetime);
+  
+  /* display plugin */
+  gtk_widget_show_all(datetime->eventbox);
 
   /* set calendar variables */
   datetime->cal = NULL;
@@ -553,9 +560,6 @@
   /* set date and time labels */
   datetime_update(datetime);
 
-  /* display plugin */
-  gtk_widget_show_all(datetime->eventbox);
-
   return datetime;
 }
 




More information about the Goodies-commits mailing list