diff options
Diffstat (limited to 'x11/gnome-panel/files/patch-applets_clock_clock-location.c')
| -rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_clock-location.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c index 7ab6064a0..1bb485f32 100644 --- a/x11/gnome-panel/files/patch-applets_clock_clock-location.c +++ b/x11/gnome-panel/files/patch-applets_clock_clock-location.c @@ -1,5 +1,5 @@ --- applets/clock/clock-location.c.orig 2008-03-22 21:14:45.000000000 -0400 -+++ applets/clock/clock-location.c 2008-03-22 23:30:43.000000000 -0400 ++++ applets/clock/clock-location.c 2008-03-23 02:11:34.000000000 -0400 @@ -28,6 +28,8 @@ #include "set-timezone.h" #include "gweather-xml.h" @@ -37,18 +37,23 @@ monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL); -@@ -632,9 +638,12 @@ gboolean +@@ -632,10 +638,17 @@ gboolean clock_location_is_current (ClockLocation *loc) { ClockLocationPrivate *priv = PRIVATE (loc); - const char *zone; + ClockZoneTable *zones; + char *zone; -+ -+ zones = clock_zonetable_new (SYSTEM_ZONEINFODIR); - if ((zone = zone_from_etc_sysconfig_clock ())) -+ if ((zone = clock_location_guess_zone (zones))) ++ zones = clock_zonetable_new (SYSTEM_ZONEINFODIR); ++ ++ if ((zone = clock_location_guess_zone (zones))) { ++ g_object_unref (zones); return strcmp (zone, priv->timezone) == 0; ++ } ++ ++ g_object_unref (zones); return clock_location_get_offset (loc) == 0; + } |