update patch

This commit is contained in:
Matthias Clasen 2008-08-05 17:28:16 +00:00
parent 72cf1eaef1
commit 3700cd642f

View File

@ -1,7 +1,7 @@
diff -up gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c diff -up gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c
--- gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok 2008-04-22 13:39:45.000000000 -0400 --- gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok 2008-08-04 10:25:53.000000000 -0400
+++ gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c 2008-04-22 13:39:50.000000000 -0400 +++ gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c 2008-08-05 13:25:25.000000000 -0400
@@ -146,6 +146,11 @@ gsd_xrandr_manager_start (GsdXrandrManag @@ -296,6 +296,12 @@ gsd_xrandr_manager_start (GsdXrandrManag
{ {
g_debug ("Starting xrandr manager"); g_debug ("Starting xrandr manager");
@ -9,7 +9,8 @@ diff -up gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c.xrandr
+ g_set_error (error, 0, 0, "Failed to initialize XRandr extension"); + g_set_error (error, 0, 0, "Failed to initialize XRandr extension");
+ return FALSE; + return FALSE;
+ } + }
+
+ +
manager->priv->running = TRUE; manager->priv->running = TRUE;
manager->priv->client = gconf_client_get_default ();
if (manager->priv->keycode) {