diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-04-23 00:24:39 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-04-23 00:24:39 +0000 |
| commit | d40859a877493236306d24059c3a10558960a45a (patch) | |
| tree | 12e33194b721ded6f3918ff4524aaabab8fd77e6 | |
| parent | 32d288f38614ab38caf76a66cfb657545b9f2d4f (diff) | |
| download | gnome-panel-d40859a877493236306d24059c3a10558960a45a.tar.gz gnome-panel-d40859a877493236306d24059c3a10558960a45a.tar.xz gnome-panel-d40859a877493236306d24059c3a10558960a45a.zip | |
Add a patch that may fix timezone setting problemsgnome-panel-2_22_1_2-5_fc9
| -rw-r--r-- | gnome-panel.spec | 2 | ||||
| -rw-r--r-- | timezone-debug.patch | 25 |
2 files changed, 7 insertions, 20 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec index 2c63a22..dbcf97f 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -369,7 +369,7 @@ fi %changelog * Tue Apr 22 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.1.2-5 -- Add some better debug output for timezone setting problems +- Add another patch that may fix timezone setting problems (#443415) * Fri Apr 18 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.1.2-4 - Use gio to open places diff --git a/timezone-debug.patch b/timezone-debug.patch index a8f2e9c..d7fbf43 100644 --- a/timezone-debug.patch +++ b/timezone-debug.patch @@ -1,26 +1,13 @@ diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.debug gnome-panel-2.22.1.2/applets/clock/system-timezone.c --- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.debug 2008-04-22 19:22:48.000000000 -0400 -+++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c 2008-04-22 19:24:51.000000000 -0400 -@@ -822,7 +822,7 @@ system_timezone_is_zone_file_valid (cons - GError *our_error; - GIOChannel *channel; - GIOStatus status; -- char buffer[strlen (TZ_MAGIC)]; -+ char buffer[strlen (TZ_MAGIC) + 1]; - gsize read; - - /* First, check the zone_file is properly rooted */ -@@ -864,10 +864,11 @@ system_timezone_is_zone_file_valid (cons ++++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c 2008-04-22 20:16:44.000000000 -0400 +@@ -863,7 +863,8 @@ system_timezone_is_zone_file_valid (cons + return FALSE; } - if (read != 4 || strcmp (buffer, TZ_MAGIC) != 0) { +- if (read != 4 || strcmp (buffer, TZ_MAGIC) != 0) { ++ if (read != strlen (TZ_MAGIC) || strncmp (buffer, TZ_MAGIC, strlen (TZ_MAGIC)) != 0) { + buffer[read] = 0; g_set_error (error, SYSTEM_TIMEZONE_ERROR, SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE, -- "%s is not a timezone file", -- zone_file); -+ "%s is not a timezone file (read %d bytes: '%s')", -+ zone_file, read, buffer); - return FALSE; - } - + "%s is not a timezone file", |