#
# Description: Fix location of external programs.
#
diff -Nur -x '*.orig' -x '*~' gdm-2.29.92/daemon/gdm-server.c gdm-2.29.92.new/daemon/gdm-server.c
--- gdm-2.29.92/daemon/gdm-server.c	2010-03-08 22:53:57.000000000 +0100
+++ gdm-2.29.92.new/daemon/gdm-server.c	2010-03-09 11:06:44.268005983 +0100
@@ -127,7 +127,7 @@
         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
 
         error = NULL;
-        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
+        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
                                    server->priv->display_name);
 
         g_debug ("GdmServer: Running helper %s", command);
diff -Nur -x '*.orig' -x '*~' gdm-2.29.92/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.29.92.new/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
--- gdm-2.29.92/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-03-08 22:53:57.000000000 +0100
+++ gdm-2.29.92.new/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-03-09 11:06:44.268005983 +0100
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 _Name=GNOME Settings Daemon
-TryExec=@LIBEXECDIR@/gnome-settings-daemon
-Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
+TryExec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon
+Exec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
 OnlyShowIn=GNOME;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-Autostart-Notify=true
diff -Nur -x '*.orig' -x '*~' gdm-2.29.92/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in gdm-2.29.92.new/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in
--- gdm-2.29.92/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in	2010-03-08 23:16:39.000000000 +0100
+++ gdm-2.29.92.new/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in	2010-03-09 11:09:39.201079872 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Application
 _Name=PolicyKit Authentication Agent
-Exec=/usr/lib/polkit-gnome-authentication-agent-1
+Exec=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
 OnlyShowIn=GNOME;
diff -Nur -x '*.orig' -x '*~' gdm-2.29.92/gui/simple-chooser/gdm-chooser-session.c gdm-2.29.92.new/gui/simple-chooser/gdm-chooser-session.c
--- gdm-2.29.92/gui/simple-chooser/gdm-chooser-session.c	2010-03-08 22:53:57.000000000 +0100
+++ gdm-2.29.92.new/gui/simple-chooser/gdm-chooser-session.c	2010-03-09 11:06:44.272003419 +0100
@@ -131,7 +131,7 @@
         ret = FALSE;
 
         error = NULL;
-        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
+        g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
         if (error != NULL) {
                 g_warning ("Error starting settings daemon: %s", error->message);
                 g_error_free (error);