[gnome-settings-daemon] - Fix setting timezones in the date & time panel (#674999)

[Bastien Nocera]

commit 181c9214665a61d8eb2213ba03cdc5bd2ed3012a
Author: Bastien Nocera <hadess at hadess.net>
Date:   Tue Feb 8 23:16:44 2011 +0000

    - Fix setting timezones in the date & time panel (#674999)

 ...x-gsd_datetime_check_tz_name-never-workin.patch |   28 ++++
 ...Handle-rename-of-org.gnome.media-handling.patch |   65 --------
 background-convert-to-gdbus.patch                  |  167 --------------------
 ...d-draw-the-background-on-startup-if-show-.patch |   41 -----
 gnome-settings-daemon.spec                         |    7 +-
 5 files changed, 34 insertions(+), 274 deletions(-)
---
diff --git a/0001-datetime-Fix-gsd_datetime_check_tz_name-never-workin.patch b/0001-datetime-Fix-gsd_datetime_check_tz_name-never-workin.patch
new file mode 100644
index 0000000..69695b5
--- /dev/null
+++ b/0001-datetime-Fix-gsd_datetime_check_tz_name-never-workin.patch
@@ -0,0 +1,28 @@
+From 967c7a9bb41ecde9293ccfd672f1b7c491e9a268 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Tue, 8 Feb 2011 23:11:08 +0000
+Subject: [PATCH] datetime: Fix gsd_datetime_check_tz_name() never working
+
+Wrong variable passed into g_file_new_for_path()...
+
+https://bugzilla.redhat.com/show_bug.cgi?id=674999
+---
+ plugins/datetime/gsd-datetime-mechanism.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/datetime/gsd-datetime-mechanism.c b/plugins/datetime/gsd-datetime-mechanism.c
+index 89f1c66..4f34f0b 100644
+--- a/plugins/datetime/gsd-datetime-mechanism.c
++++ b/plugins/datetime/gsd-datetime-mechanism.c
+@@ -517,7 +517,7 @@ gsd_datetime_check_tz_name (const char *tz,
+         tz_path = g_build_filename (SYSTEM_ZONEINFODIR, tz, NULL);
+ 
+         /* Get the actual resolved path */
+-        file = g_file_new_for_path (tz);
++        file = g_file_new_for_path (tz_path);
+         actual_path = g_file_get_path (file);
+         g_object_unref (file);
+ 
+-- 
+1.7.4
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index d64e5f6..6c47d0e 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        2.91.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -35,6 +35,7 @@ BuildRequires:  autoconf automake libtool
 BuildRequires:  libxklavier-devel
 BuildRequires:  gsettings-desktop-schemas-devel >= 0.1.2
 
+Patch0: 0001-datetime-Fix-gsd_datetime_check_tz_name-never-workin.patch
 # change font rendering
 #Patch3: slight-hinting.patch
 
@@ -54,6 +55,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .tz-setting
 #%patch3 -p1 -b .slight-hinting
 
 %build
@@ -119,6 +121,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Feb 08 2011 Bastien Nocera <bnocera at redhat.com> 2.91.9-2
+- Fix setting timezones in the date & time panel (#674999)
+
 * Wed Feb  2 2011 Matthias Clasen <mclasen at redhat.com> 2.91.9-1
 - 2.91.9