[Xfce4-commits] <orage:master> 8.6.0.7: Fixed bug 7232 clock-plugin doesn't reflect system TZ changes

[Juha Kautto]

Updating branch refs/heads/master
         to b2ded6d139875218e3d269c8becda2fc8d68f78a (commit)
       from c7372febc25d071659b8d29821956b41938fa7bc (commit)

commit b2ded6d139875218e3d269c8becda2fc8d68f78a
Author: Juha Kautto <juha at xfce.org>
Date:   Sun Feb 6 17:24:26 2011 +0200

    8.6.0.7: Fixed bug 7232 clock-plugin doesn't reflect system TZ changes
    
    Fixed panel plugin so that timezone is checked when button is pressed
    or configuration is visited.

 configure.in.in                        |    2 +-
 panel-plugin/xfce4-orageclock-plugin.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index fa565fa..b216133 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.0.6-git])
+m4_define([orage_version], [4.8.0.7-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/panel-plugin/xfce4-orageclock-plugin.c b/panel-plugin/xfce4-orageclock-plugin.c
index d09f125..4a6ad8f 100644
--- a/panel-plugin/xfce4-orageclock-plugin.c
+++ b/panel-plugin/xfce4-orageclock-plugin.c
@@ -286,6 +286,8 @@ void oc_tune_interval(Clock *clock)
 
 void oc_init_timer(Clock *clock)
 {
+    /* Fix for bug 7232. Need to make sure timezone is correct. */
+    tzset(); 
     clock->interval = OC_BASE_INTERVAL;
     if (!clock->hib_timing) /* using suspend/hibernate, do not tune time */
         oc_tune_interval(clock);
@@ -376,6 +378,8 @@ static gboolean popup_program(GtkWidget *widget, gchar *program, Clock *clock
 static gboolean on_button_press_event_cb(GtkWidget *widget
         , GdkEventButton *event, Clock *clock)
 {
+    /* Fix for bug 7232. Need to make sure timezone is correct. */
+    tzset(); 
     if (event->type != GDK_BUTTON_PRESS) /* double or triple click */
         return(FALSE); /* ignore */
     if (event->button == 1)