diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-04-22 23:42:52 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-04-22 23:42:52 +0000 |
| commit | 32d288f38614ab38caf76a66cfb657545b9f2d4f (patch) | |
| tree | 71f8ed018be4dce7bdb875bbdbd79dcc25432d3d | |
| parent | c2d9ba9b3e0a1323711b1c2b0b02c88244edf2de (diff) | |
| download | gnome-panel-32d288f38614ab38caf76a66cfb657545b9f2d4f.tar.gz gnome-panel-32d288f38614ab38caf76a66cfb657545b9f2d4f.tar.xz gnome-panel-32d288f38614ab38caf76a66cfb657545b9f2d4f.zip | |
add some debug output
| -rw-r--r-- | gnome-panel.spec | 7 | ||||
| -rw-r--r-- | timezone-debug.patch | 26 |
2 files changed, 32 insertions, 1 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec index f41d676..2c63a22 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.22.1.2 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2 @@ -127,6 +127,7 @@ Patch33: gnome-panel-use-gio.patch Patch34: gnome-panel-launch-with-gio.patch # fixed in upstream svn Patch35: timezone-64.patch +Patch36: timezone-debug.patch Conflicts: gnome-power-manager < 2.15.3 @@ -182,6 +183,7 @@ Panel Applets using the libpanel-applet library. %patch33 -p1 -b .use-gio %patch34 -p1 -b .launch-with-gio %patch35 -p1 -b .timezone-64 +%patch36 -p1 -b .timezone-debug . %{SOURCE6} @@ -366,6 +368,9 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Tue Apr 22 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.1.2-5 +- Add some better debug output for timezone setting problems + * Fri Apr 18 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.1.2-4 - Use gio to open places - Fix a 64bit issue with timezone handling in the clock diff --git a/timezone-debug.patch b/timezone-debug.patch new file mode 100644 index 0000000..a8f2e9c --- /dev/null +++ b/timezone-debug.patch @@ -0,0 +1,26 @@ +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 + } + + if (read != 4 || strcmp (buffer, 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; + } + |