[gnome-settings-daemon] - Fix crasher on startup

[Bastien Nocera]

commit eea3c6ff2368192ef30086234a3d16c2f94887be
Author: Bastien Nocera <hadess at hadess.net>
Date:   Fri Nov 26 00:10:41 2010 +0000

    - Fix crasher on startup

 ...-Don-t-pass-NULL-strings-to-g_variant_new.patch |   25 ++++++++++++++++++++
 gnome-settings-daemon.spec                         |    8 +++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-daemon-Don-t-pass-NULL-strings-to-g_variant_new.patch b/0001-daemon-Don-t-pass-NULL-strings-to-g_variant_new.patch
new file mode 100644
index 0000000..5ef3b68
--- /dev/null
+++ b/0001-daemon-Don-t-pass-NULL-strings-to-g_variant_new.patch
@@ -0,0 +1,25 @@
+From 7738a45499e658cd004ae45a58c2c3e39e3ef812 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Fri, 26 Nov 2010 00:08:21 +0000
+Subject: [PATCH] daemon: Don't pass NULL strings to g_variant_new()
+
+---
+ gnome-settings-daemon/main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
+index 2391ccf..780f5ca 100644
+--- a/gnome-settings-daemon/main.c
++++ b/gnome-settings-daemon/main.c
+@@ -114,7 +114,7 @@ got_session_proxy (GObject      *source_object,
+                 startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
+                 g_dbus_proxy_call (proxy,
+                                    "RegisterClient",
+-                                   g_variant_new ("(ss)", "gnome-settings-daemon", startup_id),
++                                   g_variant_new ("(ss)", "gnome-settings-daemon", startup_id ? startup_id : ""),
+                                    G_DBUS_CALL_FLAGS_NONE,
+                                    -1,
+                                    NULL,
+-- 
+1.7.3.2
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 79f844b..6518832 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        2.91.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -32,6 +32,8 @@ BuildRequires:  autoconf automake libtool
 BuildRequires:  libxklavier-devel
 BuildRequires:  gsettings-desktop-schemas-devel >= 0.0.2
 
+Patch0: 0001-daemon-Don-t-pass-NULL-strings-to-g_variant_new.patch
+
 # change font rendering
 #Patch3: slight-hinting.patch
 
@@ -51,6 +53,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gvariant
 #%patch3 -p1 -b .slight-hinting
 
 %build
@@ -112,6 +115,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Nov 26 2010 Bastien Nocera <bnocera at redhat.com> 2.91.4-2
+- Fix crasher on startup
+
 * Thu Nov 25 2010 Bastien Nocera <bnocera at redhat.com> 2.91.4-1
 - Update to 2.91.4