rpms/gnome-panel/F-9 gnome-panel.spec, 1.295, 1.296 timezone-debug.patch, 1.1, 1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11426

Modified Files:
	gnome-panel.spec timezone-debug.patch 
Log Message:
Add a patch that may fix timezone setting problems



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/F-9/gnome-panel.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- gnome-panel.spec	22 Apr 2008 23:42:52 -0000	1.295
+++ gnome-panel.spec	23 Apr 2008 00:24:39 -0000	1.296
@@ -369,7 +369,7 @@
 
 %changelog
 * Tue Apr 22 2008 Matthias Clasen  <mclasen at 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 at redhat.com> - 2.22.1.2-4
 - Use gio to open places 

timezone-debug.patch:

Index: timezone-debug.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/F-9/timezone-debug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timezone-debug.patch	22 Apr 2008 23:42:52 -0000	1.1
+++ timezone-debug.patch	23 Apr 2008 00:24:39 -0000	1.2
@@ -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",