Merge lp:~mterry/unity-greeter/spawn-gsd into lp:unity-greeter

[Michael Terry]

Spawn gsd directly.

And fix some glue code so that we can stuff variables like GSD_BINARY directly in config.h without having to define them on via CFLAGS.

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-01-22 21:17:22 +0000
+++ configure.ac	2013-01-30 20:36:25 +0000
@@ -30,6 +30,12 @@
 INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
 AC_SUBST(INDICATORDIR)
 
+GSD_BINARY=`$PKG_CONFIG --variable=binary gnome-settings-daemon`
+if test -z "$GSD_BINARY"; then
+    AC_MSG_ERROR([Could not find path to gnome-settings-daemon binary])
+fi
+AC_DEFINE_UNQUOTED([GSD_BINARY], ["$GSD_BINARY"], [Path to g-s-d])
+
 dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################

=== modified file 'src/config.vapi'
--- src/config.vapi	2012-08-03 13:31:27 +0000
+++ src/config.vapi	2013-01-30 20:36:25 +0000
@@ -1,4 +1,4 @@
-[CCode (cprefix = "", lower_case_cprefix = "")]
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config
 {
   public const string GETTEXT_PACKAGE;
@@ -7,4 +7,5 @@
   public const string CONFIG_FILE;
   public const string PKGDATADIR;
   public const string INDICATORDIR;
+  public const string GSD_BINARY;
 }

=== modified file 'src/settings-daemon.vala'
--- src/settings-daemon.vala	2012-09-10 15:38:59 +0000
+++ src/settings-daemon.vala	2013-01-30 20:36:25 +0000
@@ -79,22 +79,13 @@
 
     private async void run ()
     {
-        /* Activate g-s-d over dbus */
         try
         {
-            var proxy = new GLib.DBusProxy.for_bus_sync (GLib.BusType.SESSION,
-                                                         GLib.DBusProxyFlags.NONE, null,
-                                                         "org.gnome.SettingsDaemon",
-                                                         "/org/gnome/SettingsDaemon",
-                                                         "org.gnome.SettingsDaemon",
-                                                         null);
-
-            /* This tells g-s-d to activate its plugins */
-            yield proxy.call ("Awake", null, GLib.DBusCallFlags.NONE, -1, null);
+            Process.spawn_command_line_async (Config.GSD_BINARY);
         }
-        catch (Error e)
+        catch (SpawnError e)
         {
-            debug ("Could not start gnome-settings-daemon over DBus: %s", e.message);
+            debug ("Could not start gnome-settings-daemon: %s", e.message);
         }
     }
 }