[134] | 1 | # |
---|
| 2 | # Description: Fix location of external programs. |
---|
| 3 | # |
---|
| 4 | diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/daemon/gdm-server.c gdm-2.28.0.new/daemon/gdm-server.c |
---|
| 5 | --- gdm-2.28.0/daemon/gdm-server.c 2009-09-21 22:05:27.000000000 +0200 |
---|
| 6 | +++ gdm-2.28.0.new/daemon/gdm-server.c 2009-10-01 15:54:28.230760824 +0200 |
---|
| 7 | @@ -127,7 +127,7 @@ |
---|
| 8 | g_return_val_if_fail (GDM_IS_SERVER (server), NULL); |
---|
| 9 | |
---|
| 10 | error = NULL; |
---|
| 11 | - command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", |
---|
| 12 | + command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", |
---|
| 13 | server->priv->display_name); |
---|
| 14 | |
---|
| 15 | g_debug ("GdmServer: Running helper %s", command); |
---|
| 16 | diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.28.0.new/data/greeter-autostart/gnome-settings-daemon.desktop.in.in |
---|
| 17 | --- gdm-2.28.0/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2009-09-21 22:05:27.000000000 +0200 |
---|
| 18 | +++ gdm-2.28.0.new/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2009-10-01 15:54:28.230760824 +0200 |
---|
| 19 | @@ -1,8 +1,8 @@ |
---|
| 20 | [Desktop Entry] |
---|
| 21 | Type=Application |
---|
| 22 | _Name=GNOME Settings Daemon |
---|
| 23 | -TryExec=@LIBEXECDIR@/gnome-settings-daemon |
---|
| 24 | -Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins |
---|
| 25 | +TryExec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon |
---|
| 26 | +Exec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins |
---|
| 27 | OnlyShowIn=GNOME; |
---|
| 28 | X-GNOME-Autostart-Phase=Initialization |
---|
| 29 | X-GNOME-Autostart-Notify=true |
---|
| 30 | diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in gdm-2.28.0.new/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in |
---|
| 31 | --- gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in 2009-09-21 22:05:27.000000000 +0200 |
---|
| 32 | +++ gdm-2.28.0.new/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in 2009-10-01 15:54:59.094386999 +0200 |
---|
| 33 | @@ -1,5 +1,5 @@ |
---|
| 34 | [Desktop Entry] |
---|
| 35 | Type=Application |
---|
| 36 | _Name=PolicyKit Authentication Agent |
---|
| 37 | -Exec=/usr/libexec/polkit-gnome-authentication-agent-1 |
---|
| 38 | +Exec=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 |
---|
| 39 | OnlyShowIn=GNOME; |
---|
| 40 | diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/gui/simple-chooser/gdm-chooser-session.c gdm-2.28.0.new/gui/simple-chooser/gdm-chooser-session.c |
---|
| 41 | --- gdm-2.28.0/gui/simple-chooser/gdm-chooser-session.c 2009-09-21 22:05:27.000000000 +0200 |
---|
| 42 | +++ gdm-2.28.0.new/gui/simple-chooser/gdm-chooser-session.c 2009-10-01 15:54:28.230760824 +0200 |
---|
| 43 | @@ -131,7 +131,7 @@ |
---|
| 44 | ret = FALSE; |
---|
| 45 | |
---|
| 46 | error = NULL; |
---|
| 47 | - g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error); |
---|
| 48 | + g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error); |
---|
| 49 | if (error != NULL) { |
---|
| 50 | g_warning ("Error starting settings daemon: %s", error->message); |
---|
| 51 | g_error_free (error); |
---|