rpms/gnome-panel/devel timezone-64.patch,1.1,1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18875

Modified Files:
	timezone-64.patch 
Log Message:
fix patch


timezone-64.patch:

Index: timezone-64.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/timezone-64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timezone-64.patch	22 Apr 2008 16:11:33 -0000	1.1
+++ timezone-64.patch	22 Apr 2008 16:40:58 -0000	1.2
@@ -1,6 +1,7 @@
---- trunk/applets/clock/system-timezone.c	2008/04/11 12:11:19	11053
-+++ trunk/applets/clock/system-timezone.c	2008/04/11 13:11:59	11054
-@@ -447,14 +447,14 @@
+diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-64 gnome-panel-2.22.1.2/applets/clock/system-timezone.c
+--- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-64	2008-04-10 08:38:24.000000000 -0400
++++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c	2008-04-22 12:38:10.000000000 -0400
+@@ -443,14 +443,14 @@ system_timezone_write_key_file (const ch
                                  const char  *value,
                                  GError     **error)
  {
@@ -23,7 +24,7 @@
          
          if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR))
                  return TRUE;
-@@ -647,16 +647,16 @@
+@@ -613,16 +613,16 @@ system_timezone_read_etc_localtime_softl
          return tz;
  }
  
@@ -46,7 +47,7 @@
                     char         *file,
                     CompareFiles  compare_func)
  {
-@@ -709,11 +709,11 @@
+@@ -675,11 +675,11 @@ recursive_compare (struct stat  *localti
  
  
  static gboolean
@@ -63,7 +64,7 @@
  {
          return (a_stat->st_ino == b_stat->st_ino);
  }
-@@ -740,15 +740,15 @@
+@@ -706,15 +706,15 @@ system_timezone_read_etc_localtime_hardl
  }
  
  static gboolean
@@ -88,22 +89,16 @@
  
          if (a_stat->st_size != b_stat->st_size)
                  return FALSE;
-@@ -772,10 +772,10 @@
- static char *
- system_timezone_read_etc_localtime_content (void)
+@@ -740,7 +740,7 @@ system_timezone_read_etc_localtime_conte
  {
--        struct stat   stat_localtime;
--        char         *localtime_content = NULL;
+         struct stat   stat_localtime;
+         char         *localtime_content = NULL;
 -        unsigned int  localtime_content_len = -1;
--        char         *retval;
-+        struct stat  stat_localtime;
-+        char        *localtime_content = NULL;
-+        gsize        localtime_content_len = -1;
-+        char        *retval;
++        gsize         localtime_content_len = -1;
  
          if (g_stat (ETC_LOCALTIME, &stat_localtime) != 0)
                  return NULL;
-@@ -866,11 +866,11 @@
+@@ -819,11 +819,11 @@ static gboolean
  system_timezone_is_zone_file_valid (const char  *zone_file,
                                      GError     **error)
  {
@@ -120,7 +115,7 @@
  
          /* First, check the zone_file is properly rooted */
          if (!g_str_has_prefix (zone_file, SYSTEM_ZONEINFODIR"/")) {
-@@ -925,9 +925,9 @@
+@@ -878,9 +878,9 @@ static gboolean
  system_timezone_set_etc_timezone (const char  *zone_file,
                                    GError     **error)
  {