[Goodies-commits] r4994 - in xfce4-datetime-plugin/trunk: . panel-plugin

Diego Ongaro ongardie at xfce.org
Wed Jun 25 21:52:27 CEST 2008


Author: ongardie
Date: 2008-06-25 19:52:27 +0000 (Wed, 25 Jun 2008)
New Revision: 4994

Modified:
   xfce4-datetime-plugin/trunk/ChangeLog
   xfce4-datetime-plugin/trunk/panel-plugin/datetime.c
Log:
Only gsource_remove valid timeouts, pre-processor if on tooltips timeout

Pulling code from Steve Tyler's Attachment #1697 in Bug #4145.


Modified: xfce4-datetime-plugin/trunk/ChangeLog
===================================================================
--- xfce4-datetime-plugin/trunk/ChangeLog	2008-06-25 19:52:21 UTC (rev 4993)
+++ xfce4-datetime-plugin/trunk/ChangeLog	2008-06-25 19:52:27 UTC (rev 4994)
@@ -1,8 +1,11 @@
 2008-06-21	Diego Ongaro <ongardie at gmail.com>
 
-	* panel-plugin/datetime.c: Fix Bug #4157 - updates occur once a second
-	when datetime plugin shows date only. Used code from Steve Tyler's
+	* panel-plugin/datetime.c: Pulling code from Steve Tyler's
 	Attachment #1697 in Bug #4145.
+	  - Only gsource_remove valid timeouts, add pre-processor if to the
+	    tooltips timeout.
+	  - Fix Bug #4157 - updates occur once a second when datetime plugin
+	    shows date only.
 	* panel-plugin/datetime-dialog.c, panel-plugin/datetime.h: Change
 	order of layout dropdown (Bug #4158)
 

Modified: xfce4-datetime-plugin/trunk/panel-plugin/datetime.c
===================================================================
--- xfce4-datetime-plugin/trunk/panel-plugin/datetime.c	2008-06-25 19:52:21 UTC (rev 4993)
+++ xfce4-datetime-plugin/trunk/panel-plugin/datetime.c	2008-06-25 19:52:27 UTC (rev 4994)
@@ -713,8 +713,12 @@
 static void datetime_free(XfcePanelPlugin *plugin, t_datetime *datetime)
 {
   /* stop timeouts */
-  g_source_remove(datetime->timeout_id);
-  g_source_remove(datetime->tooltip_timeout_id);
+  if (datetime->timeout_id != 0)
+    g_source_remove(datetime->timeout_id);
+#if USE_GTK_TOOLTIP_API
+  if (datetime->tooltip_timeout_id != 0)
+    g_source_remove(datetime->tooltip_timeout_id);
+#endif
 
   /* destroy widget */
   gtk_widget_destroy(datetime->button);




More information about the Goodies-commits mailing list