Updating branch refs/heads/master
to 5d9618659709b820c73b547b335a8c0c160264ca (commit)
from a971e36fb3c27e51082b77e49a8f5a1eebd9fb45 (commit)
commit 5d9618659709b820c73b547b335a8c0c160264ca
Author: Steve Tyler <[email protected]>
Date: Thu Feb 24 08:59:06 2011 +0900
Reset the timer after changing properties
Fixes bug #4050.
panel-plugin/main.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index b73efd8..ad9316e 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -585,8 +585,12 @@ static void UpdateConf (void *p_pvPlugin)
SetCmd (poGUI->wTF_Cmd, poPlugin);
SetLabel (poGUI->wTF_Title, poPlugin);
SetMonitorFont (poPlugin);
- /* Force to regenerate a timer */
- poPlugin->iTimerId = 0;
+ /* Restart timer */
+ if (poPlugin->iTimerId) {
+ g_source_remove (poPlugin->iTimerId);
+ poPlugin->iTimerId = 0;
+ }
+ SetTimer(p_pvPlugin);
}/* UpdateConf() */
/**************************************************************/
@@ -830,8 +834,6 @@ static void genmon_construct (XfcePanelPlugin *plugin)
SetMonitorFont (genmon);
- SetTimer (genmon);
-
g_signal_connect (plugin, "free-data", G_CALLBACK (genmon_free), genmon);
g_signal_connect (plugin, "save", G_CALLBACK (genmon_write_config),
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
