Merge lp:~noskcaj/unity-settings-daemon/gnome-desktop-3.10 into lp:unity-settings-daemon

[Jackson Doak]

Allows unity-settings-daemon to work with gnome-desktop 3.10.
See lp:1228765

[Sebastien Bacher (seb128)]

Thank you for your work but trusty has gnome-desktop 3.8
https://launchpad.net/distros/ubuntu/+source/gnome-desktop3

review: Disapprove

[Sebastien Bacher (seb128)]

(the description is misleading, it doesn't add support for 3.10, it does port to 3.10 dropping support for the Ubuntu version, that can't be done this way)

[Sebastien Bacher (seb128)]

gnome-desktop got updated previous cycle, those changes are not needed anymore/deprecated

review: Disapprove

Unmerged revisions

4030. By Jackson Doak on 2014-03-01

Bump b-dep on libgnome-desktop-3-dev to 3.10

4029. By Jackson Doak on 2014-03-01

Depend on displayconfig

4028. By Jackson Doak on 2014-03-01

support gnome desktop 3.10

=== modified file 'debian/control'
--- debian/control	2014-02-26 18:25:15 +0000
+++ debian/control	2014-03-01 03:37:38 +0000
@@ -11,7 +11,7 @@
                intltool (>= 0.37.1),
                libdbus-glib-1-dev (>= 0.74),
                libglib2.0-dev (>= 2.35.3),
-               libgtk-3-dev (>= 3.7.8),
+               libgtk-3-dev (>= 3.10),
                libnotify-dev (>= 0.7.0),
                libxt-dev,
                libxi-dev,
@@ -20,7 +20,7 @@
                libx11-dev,
                libxtst-dev,
                gsettings-desktop-schemas-dev (>= 3.7.2.1),
-               libgnome-desktop-3-dev (>= 3.7.90),
+               libgnome-desktop-3-dev (>= 3.10),
                libpulse-dev (>= 1:2.0),
                libasound2-dev,
                librsvg2-dev (>= 2.36.2),
@@ -53,6 +53,7 @@
          gnome-settings-daemon-schemas (>= 3.8), 
          gnome-settings-daemon-schemas (<< 3.10),
          gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
+         displayconfig
 Recommends: ibus (>= 1.5.0),
             pulseaudio,
             systemd-services

=== modified file 'plugins/color/gsd-color-manager.c'
--- plugins/color/gsd-color-manager.c	2013-05-09 13:50:15 +0000
+++ plugins/color/gsd-color-manager.c	2014-03-01 03:37:38 +0000
@@ -762,8 +762,6 @@
                 goto out;
         }
         for (i = 0; outputs[i] != NULL && output == NULL; i++) {
-                if (!gnome_rr_output_is_connected (outputs[i]))
-                        continue;
                 output_id = gcm_session_get_output_id (manager, outputs[i]);
                 if (g_strcmp0 (output_id, device_id) == 0)
                         output = outputs[i];
@@ -800,13 +798,11 @@
                 return FALSE;
         }
         for (i = 0; outputs[i] != NULL; i++) {
-                if (!gnome_rr_output_is_connected (outputs[i]))
-                        continue;
                 if (connected == NULL)
                         connected = outputs[i];
                 if (gnome_rr_output_get_is_primary (outputs[i]))
                         has_primary = TRUE;
-                if (gnome_rr_output_is_laptop (outputs[i]))
+                if (gnome_rr_output_is_builtin_display (outputs[i]))
                         has_laptop = TRUE;
         }
 
@@ -816,7 +812,7 @@
 
         /* choosing the internal panel is probably sane */
         if (has_laptop)
-                return gnome_rr_output_is_laptop (output);
+                return gnome_rr_output_is_builtin_display (output);
 
         /* we have to choose one, so go for the first connected device */
         if (connected != NULL)
@@ -915,7 +911,7 @@
          * calibration brightness then set this new brightness */
         brightness_profile = cd_profile_get_metadata_item (profile,
                                                            CD_PROFILE_METADATA_SCREEN_BRIGHTNESS);
-        if (gnome_rr_output_is_laptop (output) &&
+        if (gnome_rr_output_is_builtin_display (output) &&
             brightness_profile != NULL) {
                 /* the percentage is stored in the profile metadata as
                  * a string, not ideal, but it's all we have... */
@@ -1228,7 +1224,7 @@
         }
 
         /* prefer DMI data for the internal output */
-        ret = gnome_rr_output_is_laptop (output);
+        ret = gnome_rr_output_is_builtin_display (output);
         if (ret) {
                 model = gcm_dmi_get_name (priv->dmi);
                 vendor = gcm_dmi_get_vendor (priv->dmi);
@@ -1295,7 +1291,7 @@
 #if CD_CHECK_VERSION(0,1,27)
         /* set this so we can call the device a 'Laptop Screen' in the
          * control center main panel */
-        if (gnome_rr_output_is_laptop (output)) {
+        if (gnome_rr_output_is_builtin_display (output)) {
                 g_hash_table_insert (device_props,
                                      (gpointer) CD_DEVICE_PROPERTY_EMBEDDED,
                                      NULL);
@@ -1457,9 +1453,6 @@
                 return;
         }
         for (i = 0; outputs[i] != NULL; i++) {
-                if (!gnome_rr_output_is_connected (outputs[i]))
-                        continue;
-
                 /* get CdDevice for this output */
                 cd_client_find_device_by_property (manager->priv->client,
                                                    CD_DEVICE_METADATA_XRANDR_NAME,
@@ -1519,8 +1512,7 @@
                 goto out;
         }
         for (i = 0; outputs[i] != NULL; i++) {
-                if (gnome_rr_output_is_connected (outputs[i]))
-                        gcm_session_add_x11_output (manager, outputs[i]);
+                gcm_session_add_x11_output (manager, outputs[i]);
         }
 
         /* only connect when colord is awake */
@@ -1549,31 +1541,39 @@
         return;
 }
 
+static void
+on_rr_screen_acquired (GObject      *object,
+                       GAsyncResult *result,
+                       gpointer      data)
+{
+        GsdColorManager *manager = data;        
+        GsdColorManagerPrivate *priv = manager->priv;
+        GnomeRRScreen *screen;
+
+        g_debug ("Starting color manager");
+        gnome_settings_profile_start (NULL);
+
+        screen = gnome_rr_screen_new_finish (result, NULL);
+        if (!screen)
+                return;
+
+        priv->x11_screen = screen;
+
+        cd_client_connect (priv->client,
+                           NULL,
+                           gcm_session_client_connect_cb,
+                           manager);
+}
+
 gboolean
 gsd_color_manager_start (GsdColorManager *manager,
                          GError          **error)
 {
-        GsdColorManagerPrivate *priv = manager->priv;
-        gboolean ret = FALSE;
-
-        g_debug ("Starting color manager");
-        gnome_settings_profile_start (NULL);
-
         /* coldplug the list of screens */
-        priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
-        if (priv->x11_screen == NULL)
-                goto out;
-
-        cd_client_connect (priv->client,
-                           NULL,
-                           gcm_session_client_connect_cb,
-                           manager);
-
-        /* success */
-        ret = TRUE;
-out:
-        gnome_settings_profile_end (NULL);
-        return ret;
+        gnome_rr_screen_new_async (gdk_screen_get_default (),
+                                   on_rr_screen_acquired,
+                                   manager);
+        return TRUE;
 }
 
 void

=== modified file 'plugins/common/gsd-keygrab.c'
--- plugins/common/gsd-keygrab.c	2014-02-17 14:29:51 +0000
+++ plugins/common/gsd-keygrab.c	2014-03-01 03:37:38 +0000
@@ -673,13 +673,15 @@
 	g_free (key);
 }
 
-static void
-grab_button_real (int        deviceid,
-		  gboolean   grab,
-		  GdkWindow *root)
+void
+grab_button (int        deviceid,
+             gboolean   grab,
+             GdkScreen *screen)
 {
+	GdkWindow *root;
 	XIGrabModifiers mods;
 
+	root = gdk_screen_get_root_window (screen);
 	mods.modifiers = XIAnyModifier;
 
 	if (grab) {
@@ -713,19 +715,3 @@
 				1, &mods);
 	}
 }
-
-void
-grab_button (int      deviceid,
-	     gboolean grab,
-	     GSList  *screens)
-{
-        GSList *l;
-
-        for (l = screens; l; l = l->next) {
-                GdkScreen *screen = l->data;
-
-		grab_button_real (deviceid,
-				  grab,
-				  gdk_screen_get_root_window (screen));
-        }
-}

=== modified file 'plugins/common/gsd-keygrab.h'
--- plugins/common/gsd-keygrab.h	2014-02-17 14:29:51 +0000
+++ plugins/common/gsd-keygrab.h	2014-03-01 03:37:38 +0000
@@ -54,9 +54,9 @@
 Key *           parse_key        (const char    *str);
 void            free_key         (Key           *key);
 
-void            grab_button      (int      deviceid,
-                                  gboolean grab,
-                                  GSList  *screens);
+void            grab_button      (int        deviceid,
+                                  gboolean   grab,
+                                  GdkScreen *screen);
 
 G_END_DECLS
 

=== modified file 'plugins/cursor/gsd-cursor-manager.c'
--- plugins/cursor/gsd-cursor-manager.c	2013-04-15 11:23:06 +0000
+++ plugins/cursor/gsd-cursor-manager.c	2014-03-01 03:37:38 +0000
@@ -167,7 +167,7 @@
                 return TRUE;
 
         /* Create IdleMonitors for each pointer device */
-        monitor = gnome_idle_monitor_new_for_device (device);
+        monitor = gnome_idle_monitor_new_for_device (device, error);
         if (!monitor) {
                 g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
                              "Per-device idletime monitor not available");

=== modified file 'plugins/power/gpm-common.c'
--- plugins/power/gpm-common.c	2013-12-04 23:55:26 +0000
+++ plugins/power/gpm-common.c	2014-03-01 03:37:38 +0000
@@ -1178,10 +1178,8 @@
                 goto out;
 
         for (i = 0; outputs[i] != NULL; i++) {
-                if (gnome_rr_output_is_connected (outputs[i]) &&
-                    gnome_rr_output_is_laptop (outputs[i]) &&
-                    gnome_rr_output_get_backlight_min (outputs[i]) >= 0 &&
-                    gnome_rr_output_get_backlight_max (outputs[i]) > 0) {
+                if (gnome_rr_output_is_builtin_display (outputs[i]) &&
+                    gnome_rr_output_get_backlight (outputs[i]) >= 0) {
                         output = outputs[i];
                         break;
                 }
@@ -1407,8 +1405,7 @@
         /* prefer xbacklight */
         output = get_primary_output (rr_screen);
         if (output != NULL) {
-                return gnome_rr_output_get_backlight (output,
-                                                      error);
+                return gnome_rr_output_get_backlight (output);
         }
 
         /* fall back to the polkit helper */
@@ -1427,10 +1424,7 @@
         /* prefer xbacklight */
         output = get_primary_output (rr_screen);
         if (output != NULL) {
-
-                min = gnome_rr_output_get_backlight_min (output);
-                max = gnome_rr_output_get_backlight_max (output);
-                now = gnome_rr_output_get_backlight (output, error);
+                now = gnome_rr_output_get_backlight (output);
                 if (now < 0)
                         goto out;
                 value = ABS_TO_PERCENTAGE (min, max, now);
@@ -1444,7 +1438,7 @@
         now = backlight_helper_get_value ("get-brightness", error);
         if (now < 0)
                 goto out;
-        value = ABS_TO_PERCENTAGE (min, max, now);
+        value = ABS_TO_PERCENTAGE (0, 100, now);
 out:
         return value;
 }
@@ -1452,36 +1446,18 @@
 int
 backlight_get_min (GnomeRRScreen *rr_screen)
 {
-        GnomeRROutput *output;
-
-        /* if we have no xbacklight device, then hardcode zero as sysfs
-         * offsets everything to 0 as min */
-        output = get_primary_output (rr_screen);
-        if (output == NULL)
-                return 0;
-
-        /* get xbacklight value, which maybe non-zero */
-        return gnome_rr_output_get_backlight_min (output);
+        return 0;
 }
 
 int
 backlight_get_max (GnomeRRScreen *rr_screen, GError **error)
 {
-        gint value;
         GnomeRROutput *output;
 
         /* prefer xbacklight */
         output = get_primary_output (rr_screen);
-        if (output != NULL) {
-                value = gnome_rr_output_get_backlight_max (output);
-                if (value < 0) {
-                        g_set_error (error,
-                                     GSD_POWER_MANAGER_ERROR,
-                                     GSD_POWER_MANAGER_ERROR_FAILED,
-                                     "failed to get backlight max");
-                }
-                return value;
-        }
+        if (output != NULL)
+                return 100;
 
         /* fall back to the polkit helper */
         return  backlight_helper_get_value ("get-max-brightness", error);
@@ -1500,19 +1476,8 @@
 
         /* prefer xbacklight */
         output = get_primary_output (rr_screen);
-        if (output != NULL) {
-                min = gnome_rr_output_get_backlight_min (output);
-                max = gnome_rr_output_get_backlight_max (output);
-                if (min < 0 || max < 0) {
-                        g_warning ("no xrandr backlight capability");
-                        return ret;
-                }
-                discrete = PERCENTAGE_TO_ABS (min, max, value);
-                ret = gnome_rr_output_set_backlight (output,
-                                                     discrete,
-                                                     error);
-                return ret;
-        }
+        if (output != NULL)
+                return gnome_rr_output_set_backlight (output, value, error);
 
         /* fall back to the polkit helper */
         max = backlight_helper_get_value ("get-max-brightness", error);
@@ -1552,9 +1517,9 @@
                                      gnome_rr_output_get_name (output));
                         return percentage_value;
                 }
-                min = gnome_rr_output_get_backlight_min (output);
-                max = gnome_rr_output_get_backlight_max (output);
-                now = gnome_rr_output_get_backlight (output, error);
+                min = 0;
+                max = 100;
+                now = gnome_rr_output_get_backlight (output);
                 if (now < 0)
                        return percentage_value;
                 step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
@@ -1611,9 +1576,9 @@
                                      gnome_rr_output_get_name (output));
                         return percentage_value;
                 }
-                min = gnome_rr_output_get_backlight_min (output);
-                max = gnome_rr_output_get_backlight_max (output);
-                now = gnome_rr_output_get_backlight (output, error);
+                min = 0;
+                max = 100;
+                now = gnome_rr_output_get_backlight (output);
                 if (now < 0)
                        return percentage_value;
                 step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
@@ -1655,10 +1620,7 @@
         /* prefer xbacklight */
         output = get_primary_output (rr_screen);
         if (output != NULL) {
-                ret = gnome_rr_output_set_backlight (output,
-                                                     value,
-                                                     error);
-                return ret;
+                return gnome_rr_output_set_backlight (output, value, error);
         }
 
         /* fall back to the polkit helper */
@@ -1700,6 +1662,44 @@
         return gnome_rr_crtc_get_current_mode (crtc) != NULL;
 }
 
+#ifdef GSD_MOCK
+static void
+mock_monitor_changed (GFileMonitor     *monitor,
+		      GFile            *file,
+		      GFile            *other_file,
+		      GFileMonitorEvent event_type,
+		      gpointer          user_data)
+{
+	GnomeRRScreen *screen = (GnomeRRScreen *) user_data;
+
+	g_debug ("Mock screen configuration changed");
+	g_signal_emit_by_name (G_OBJECT (screen), "changed");
+}
+
+static void
+screen_destroyed (gpointer  user_data,
+		  GObject  *where_the_object_was)
+{
+	g_object_unref (G_OBJECT (user_data));
+}
+#endif /* GSD_MOCK */
+
+void
+watch_external_monitor (GnomeRRScreen *screen)
+{
+#ifdef GSD_MOCK
+	GFile *file;
+	GFileMonitor *monitor;
+
+	file = g_file_new_for_commandline_arg ("GSD_MOCK_EXTERNAL_MONITOR");
+	monitor = g_file_monitor (file, G_FILE_MONITOR_NONE, NULL, NULL);
+	g_object_unref (file);
+	g_signal_connect (monitor, "changed",
+			  G_CALLBACK (mock_monitor_changed), screen);
+	g_object_weak_ref (G_OBJECT (screen), screen_destroyed, monitor);
+#endif /* GSD_MOCK */
+}
+
 gboolean
 external_monitor_is_connected (GnomeRRScreen *screen)
 {
@@ -1712,9 +1712,11 @@
 	if (g_file_get_contents ("GSD_MOCK_EXTERNAL_MONITOR", &mock_external_monitor_contents, NULL, NULL)) {
 		if (mock_external_monitor_contents[0] == '1') {
 			g_free (mock_external_monitor_contents);
+			g_debug ("Mock external monitor is on");
 			return TRUE;
 		} else if (mock_external_monitor_contents[0] == '0') {
 			g_free (mock_external_monitor_contents);
+			g_debug ("Mock external monitor is off");
 			return FALSE;
 		}
 
@@ -1727,7 +1729,7 @@
         outputs = gnome_rr_screen_list_outputs (screen);
         for (i = 0; outputs[i] != NULL; i++) {
                 if (randr_output_is_on (outputs[i]) &&
-                    !gnome_rr_output_is_laptop (outputs[i]))
+                    !gnome_rr_output_is_builtin_display (outputs[i]))
                         return TRUE;
         }
 

=== modified file 'plugins/power/gpm-common.h'
--- plugins/power/gpm-common.h	2013-01-25 19:32:56 +0000
+++ plugins/power/gpm-common.h	2014-03-01 03:37:38 +0000
@@ -69,6 +69,7 @@
                                                          GError **error);
 
 /* RandR helpers */
+void             watch_external_monitor                 (GnomeRRScreen *screen);
 gboolean         external_monitor_is_connected          (GnomeRRScreen *screen);
 
 /* Sound helpers */

=== modified file 'plugins/power/gsd-power-manager.c'
--- plugins/power/gsd-power-manager.c	2014-02-08 20:53:08 +0000
+++ plugins/power/gsd-power-manager.c	2014-03-01 03:37:38 +0000
@@ -175,6 +175,7 @@
         gboolean                 screensaver_active;
 
         /* State */
+        gboolean                 lid_is_present;
         gboolean                 lid_is_closed;
         UpClient                *up_client;
         gchar                   *previous_summary;
@@ -2304,7 +2305,10 @@
 
         setup_lid_closed_action (manager);
 
-        /* same state */
+        if (!manager->priv->lid_is_present)
+                return;
+
+        /* same lid state */
         tmp = up_client_get_lid_is_closed (manager->priv->up_client);
         if (manager->priv->lid_is_closed == tmp)
                 return;
@@ -3343,6 +3347,8 @@
 {
         GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
 
+        g_debug ("Screen configuration changed");
+
         if (suspend_on_lid_close (manager)) {
                 restart_inhibit_lid_switch_timer (manager);
                 return;
@@ -3360,15 +3366,6 @@
         setup_inhibit_lid_switch_timer (manager);
 }
 
-#ifdef GSD_MOCK
-static gboolean
-received_sigusr2 (GsdPowerManager *manager)
-{
-        on_randr_event (NULL, manager);
-        return TRUE;
-}
-#endif /* GSD_MOCK */
-
 static void
 handle_suspend_actions (GsdPowerManager *manager)
 {
@@ -3416,43 +3413,34 @@
         }
 }
 
-gboolean
-gsd_power_manager_start (GsdPowerManager *manager,
-                         GError **error)
+static void
+on_rr_screen_acquired (GObject      *object,
+                       GAsyncResult *result,
+                       gpointer      user_data)
 {
-        g_debug ("Starting power manager");
+        GsdPowerManager *manager = user_data;
+
         gnome_settings_profile_start (NULL);
 
-        /* coldplug the list of screens */
-        manager->priv->rr_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
-        if (manager->priv->rr_screen == NULL) {
-                g_debug ("Couldn't detect any screens, disabling plugin");
-                return FALSE;
-        }
-
-        /* Check for XTEST support */
-        if (supports_xtest () == FALSE) {
-                g_debug ("XTEST extension required, disabling plugin");
-                return FALSE;
-        }
-
-        /* Set up the logind proxy */
-        manager->priv->logind_proxy =
-                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                               0,
-                                               NULL,
-                                               SYSTEMD_DBUS_NAME,
-                                               SYSTEMD_DBUS_PATH,
-                                               SYSTEMD_DBUS_INTERFACE,
-                                               NULL,
-                                               error);
-        if (manager->priv->logind_proxy == NULL) {
-                g_debug ("No systemd (logind) support, disabling plugin");
-                return FALSE;
-        }
+        manager->priv->rr_screen = gnome_rr_screen_new_finish (result, NULL);
+
+        /* set up the screens */
+        if (manager->priv->lid_is_present) {
+                g_signal_connect (manager->priv->rr_screen, "changed", G_CALLBACK (on_randr_event), manager);
+                watch_external_monitor (manager->priv->rr_screen);
+                on_randr_event (manager->priv->rr_screen, manager);
+        }
+
+        /* check whether a backlight is available */
+        manager->priv->backlight_available = backlight_available (manager->priv->rr_screen);
+
+        /* ensure the default dpms timeouts are cleared */
+        backlight_enable (manager);
+
         g_signal_connect (manager->priv->logind_proxy, "g-signal",
                           G_CALLBACK (logind_proxy_signal_cb),
                           manager);
+
         /* Set up a delay inhibitor to be informed about suspend attempts */
         inhibit_suspend (manager);
 
@@ -3473,8 +3461,6 @@
         g_signal_connect (manager->priv->settings_session, "changed",
                           G_CALLBACK (engine_settings_key_changed_cb), manager);
         manager->priv->settings_xrandr = g_settings_new (GSD_XRANDR_SETTINGS_SCHEMA);
-        manager->priv->up_client = up_client_new ();
-        manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
         g_signal_connect (manager->priv->up_client, "device-added",
                           G_CALLBACK (engine_device_added_cb), manager);
         g_signal_connect (manager->priv->up_client, "device-removed",
@@ -3552,20 +3538,6 @@
         /* create IDLETIME watcher */
         manager->priv->idle_monitor = gnome_idle_monitor_new ();
 
-        /* set up the screens */
-        g_signal_connect (manager->priv->rr_screen, "changed", G_CALLBACK (on_randr_event), manager);
-        on_randr_event (manager->priv->rr_screen, manager);
-
-#ifdef GSD_MOCK
-        g_unix_signal_add (SIGUSR2, (GSourceFunc) received_sigusr2, manager);
-#endif /* GSD_MOCK */
-
-        /* check whether a backlight is available */
-        manager->priv->backlight_available = backlight_available (manager->priv->rr_screen);
-
-        /* ensure the default dpms timeouts are cleared */
-        backlight_enable (manager);
-
         /* coldplug the engine */
         engine_coldplug (manager);
         idle_configure (manager);
@@ -3577,6 +3549,47 @@
 
         setup_lid_closed_action (manager);
         gnome_settings_profile_end (NULL);
+}
+
+gboolean
+gsd_power_manager_start (GsdPowerManager *manager,
+                         GError **error)
+{
+        g_debug ("Starting power manager");
+        gnome_settings_profile_start (NULL);
+
+        /* Check whether we have a lid first */
+        manager->priv->up_client = up_client_new ();
+        manager->priv->lid_is_present = up_client_get_lid_is_present (manager->priv->up_client);
+        if (manager->priv->lid_is_present)
+                manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
+
+        /* Set up the logind proxy */
+        manager->priv->logind_proxy =
+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                               0,
+                                               NULL,
+                                               SYSTEMD_DBUS_NAME,
+                                               SYSTEMD_DBUS_PATH,
+                                               SYSTEMD_DBUS_INTERFACE,
+                                               NULL,
+                                               error);
+        if (manager->priv->logind_proxy == NULL) {
+                g_debug ("No systemd (logind) support, disabling plugin");
+                return FALSE;
+        }
+
+        /* Check for XTEST support */
+        if (supports_xtest () == FALSE) {
+                g_debug ("XTEST extension required, disabling plugin");
+                return FALSE;
+        }
+
+        /* coldplug the list of screens */
+        gnome_rr_screen_new_async (gdk_screen_get_default (),
+                                   on_rr_screen_acquired, manager);
+
+        gnome_settings_profile_end (NULL);
         return TRUE;
 }
 

=== modified file 'plugins/wacom/gsd-wacom-device.c'
--- plugins/wacom/gsd-wacom-device.c	2012-12-20 10:20:29 +0000
+++ plugins/wacom/gsd-wacom-device.c	2014-03-01 03:37:38 +0000
@@ -521,35 +521,26 @@
 	rr_outputs = gnome_rr_screen_list_outputs (rr_screen);
 
 	for (i = 0; rr_outputs[i] != NULL; i++) {
-		gchar *o_vendor_s;
-		gchar *o_product_s;
-		int o_product;
-		gchar *o_serial_s;
-		int o_serial;
+		gchar *o_vendor;
+		gchar *o_product;
+		gchar *o_serial;
 		gboolean match;
 
-		if (!gnome_rr_output_is_connected (rr_outputs[i]))
-			continue;
-
-		if (!gnome_rr_output_get_ids_from_edid (rr_outputs[i],
-						        &o_vendor_s,
-						        &o_product,
-						        &o_serial))
-			continue;
-
-		o_product_s = g_strdup_printf ("%d", o_product);
-		o_serial_s  = g_strdup_printf ("%d", o_serial);
+		gnome_rr_output_get_ids_from_edid (rr_outputs[i],
+						   &o_vendor,
+						   &o_product,
+						   &o_serial);
 
 		g_debug ("Checking for match between '%s','%s','%s' and '%s','%s','%s'", \
-		         vendor, product, serial, o_vendor_s, o_product_s, o_serial_s);
-
-		match = (vendor  == NULL || g_strcmp0 (vendor,  o_vendor_s)  == 0) && \
-		        (product == NULL || g_strcmp0 (product, o_product_s) == 0) && \
-		        (serial  == NULL || g_strcmp0 (serial,  o_serial_s)  == 0);
-
-		g_free (o_vendor_s);
-		g_free (o_product_s);
-		g_free (o_serial_s);
+		         vendor, product, serial, o_vendor, o_product, o_serial);
+
+		match = (vendor  == NULL || g_strcmp0 (vendor,  o_vendor)  == 0) && \
+		        (product == NULL || g_strcmp0 (product, o_product) == 0) && \
+		        (serial  == NULL || g_strcmp0 (serial,  o_serial)  == 0);
+
+		g_free (o_vendor);
+		g_free (o_product);
+		g_free (o_serial);
 
 		if (match) {
 			retval = rr_outputs[i];
@@ -573,10 +564,7 @@
 
 	rr_outputs = gnome_rr_screen_list_outputs (rr_screen);
 	for (i = 0; rr_outputs[i] != NULL; i++) {
-		if (!gnome_rr_output_is_connected (rr_outputs[i]))
-			continue;
-
-		if (gnome_rr_output_is_laptop(rr_outputs[i])) {
+		if (gnome_rr_output_is_builtin_display(rr_outputs[i])) {
 			retval = rr_outputs[i];
 			break;
 		}
@@ -699,8 +687,7 @@
 	GVariant    *c_array;
 	GVariant    *n_array;
 	gsize        nvalues;
-	gchar       *o_vendor_s, *o_product_s, *o_serial_s;
-	int          o_product, o_serial;
+	gchar       *o_vendor, *o_product, *o_serial;
 	const gchar *values[3];
 
 	tablet  = gsd_wacom_device_get_settings (device);
@@ -711,28 +698,26 @@
 		return;
 	}
 
-	if (rr_output == NULL ||
-	    !gnome_rr_output_get_ids_from_edid (rr_output,
-					        &o_vendor_s,
-					        &o_product,
-					        &o_serial)) {
-		o_vendor_s  = g_strdup ("");
-		o_product_s = g_strdup ("");
-		o_serial_s  = g_strdup ("");
+	if (rr_output == NULL) {
+	  o_vendor  = g_strdup ("");
+	  o_product = g_strdup ("");
+	  o_serial  = g_strdup ("");
 	} else {
-		o_product_s = g_strdup_printf ("%d", o_product);
-		o_serial_s  = g_strdup_printf ("%d", o_serial);
+	  gnome_rr_output_get_ids_from_edid (rr_output,
+					     &o_vendor,
+					     &o_product,
+					     &o_serial);
 	}
 
-	values[0] = o_vendor_s;
-	values[1] = o_product_s;
-	values[2] = o_serial_s;
+	values[0] = o_vendor;
+	values[1] = o_product;
+	values[2] = o_serial;
 	n_array = g_variant_new_strv ((const gchar * const *) &values, 3);
 	g_settings_set_value (tablet, "display", n_array);
 
-	g_free (o_vendor_s);
-	g_free (o_product_s);
-	g_free (o_serial_s);
+	g_free (o_vendor);
+	g_free (o_product);
+	g_free (o_serial);
 }
 
 static GsdWacomRotation

=== modified file 'plugins/wacom/gsd-wacom-manager.c'
--- plugins/wacom/gsd-wacom-manager.c	2013-12-04 23:55:26 +0000
+++ plugins/wacom/gsd-wacom-manager.c	2014-03-01 03:37:38 +0000
@@ -79,10 +79,10 @@
         guint device_added_id;
         guint device_removed_id;
         GHashTable *devices; /* key = GdkDevice, value = GsdWacomDevice */
-        GList *rr_screens;
+        GnomeRRScreen *rr_screen;
 
         /* button capture */
-        GSList *screens;
+        GdkScreen *screen;
         int      opcode;
 
         /* Help OSD window */
@@ -745,7 +745,7 @@
 
 		id = get_device_id (device);
 		reset_pad_buttons (device);
-		grab_button (id, TRUE, manager->priv->screens);
+		grab_button (id, TRUE, manager->priv->screen);
 		return;
 	}
 
@@ -1339,7 +1339,6 @@
 gsd_wacom_manager_idle_cb (GsdWacomManager *manager)
 {
 	GList *devices, *l;
-	GSList *ls;
 
         gnome_settings_profile_start (NULL);
 
@@ -1353,11 +1352,9 @@
         g_list_free (devices);
 
         /* Start filtering the button events */
-        for (ls = manager->priv->screens; ls != NULL; ls = ls->next) {
-                gdk_window_add_filter (gdk_screen_get_root_window (ls->data),
-                                       (GdkFilterFunc) filter_button_events,
-                                       manager);
-        }
+        gdk_window_add_filter (gdk_screen_get_root_window (manager->priv->screen),
+                               (GdkFilterFunc) filter_button_events,
+                               manager);
 
         gnome_settings_profile_end (NULL);
 
@@ -1406,41 +1403,45 @@
 	}
 	g_list_free (devices);
 }
-
-static void
-init_screens (GsdWacomManager *manager)
-{
-        GdkDisplay *display;
-        int i;
-
-        display = gdk_display_get_default ();
-        for (i = 0; i < gdk_display_get_n_screens (display); i++) {
-                GError *error = NULL;
-                GdkScreen *screen;
-                GnomeRRScreen *rr_screen;
-
-                screen = gdk_display_get_screen (display, i);
-                if (screen == NULL) {
-                        continue;
-                }
-                manager->priv->screens = g_slist_append (manager->priv->screens, screen);
-
-		/*
-		 * We also keep a list of GnomeRRScreen to monitor changes such as rotation
-		 * which are not reported by Gdk's "monitors-changed" callback
-		 */
-		rr_screen = gnome_rr_screen_new (screen, &error);
-		if (rr_screen == NULL) {
-			g_warning ("Failed to create GnomeRRScreen: %s", error->message);
-			g_error_free (error);
-			continue;
-		}
-		manager->priv->rr_screens = g_list_prepend (manager->priv->rr_screens, rr_screen);
-		g_signal_connect (rr_screen,
-				  "changed",
-				  G_CALLBACK (on_screen_changed_cb),
-			          manager);
-        }
+static void
+on_rr_screen_acquired (GObject      *object,
+                       GAsyncResult *result,
+                       gpointer      user_data)
+{
+        GsdWacomManager *manager = user_data;
+        GError *error = NULL;
+
+        manager->priv->rr_screen = gnome_rr_screen_new_finish (result, NULL);
+        if (manager->priv->rr_screen == NULL) {
+                g_warning ("Failed to create GnomeRRScreen: %s", error->message);
+                g_error_free (error);
+                return;
+        }
+
+        g_signal_connect (manager->priv->rr_screen,
+                          "changed",
+                          G_CALLBACK (on_screen_changed_cb),
+                          manager);
+}
+
+static void
+init_screen (GsdWacomManager *manager)
+{
+        GError *error = NULL;
+        GdkScreen *screen;
+        GnomeRRScreen *rr_screen;
+
+        screen = gdk_screen_get_default ();
+        if (screen == NULL) {
+                return;
+        }
+        manager->priv->screen = screen;
+
+        /*
+         * We keep GnomeRRScreen to monitor changes such as rotation
+         * which are not reported by Gdk's "monitors-changed" callback
+         */
+        gnome_rr_screen_new_async (screen, on_rr_screen_acquired, manager);
 }
 
 gboolean
@@ -1459,7 +1460,7 @@
                 return TRUE;
         }
 
-        init_screens (manager);
+        init_screen (manager);
 
         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) gsd_wacom_manager_idle_cb, manager);
 
@@ -1472,7 +1473,6 @@
 gsd_wacom_manager_stop (GsdWacomManager *manager)
 {
         GsdWacomManagerPrivate *p = manager->priv;
-        GSList *ls;
         GList *l;
 
         g_debug ("Stopping wacom manager");
@@ -1492,7 +1492,7 @@
                                 int id;
 
                                 id = get_device_id (l->data);
-                                grab_button (id, FALSE, manager->priv->screens);
+                                grab_button (id, FALSE, manager->priv->screen);
                         }
                 }
                 g_list_free (devices);
@@ -1500,14 +1500,11 @@
                 p->device_manager = NULL;
         }
 
-        for (ls = p->screens; ls != NULL; ls = ls->next) {
-                gdk_window_remove_filter (gdk_screen_get_root_window (ls->data),
-                                          (GdkFilterFunc) filter_button_events,
-                                          manager);
-        }
+        gdk_window_remove_filter (gdk_screen_get_root_window (p->screen),
+                                  (GdkFilterFunc) filter_button_events,
+                                  manager);
 
-	for (l = p->rr_screens; l != NULL; l = l->next)
-		g_signal_handlers_disconnect_by_func (l->data, on_screen_changed_cb, manager);
+        g_signal_handlers_disconnect_by_func (p->rr_screen, on_screen_changed_cb, manager);
 
         g_clear_pointer (&p->osd_window, gtk_widget_destroy);
 }
@@ -1529,14 +1526,9 @@
                 wacom_manager->priv->devices = NULL;
         }
 
-        if (wacom_manager->priv->screens != NULL) {
-                g_slist_free (wacom_manager->priv->screens);
-                wacom_manager->priv->screens = NULL;
-        }
-
-	if (wacom_manager->priv->rr_screens != NULL) {
-		g_list_free_full (wacom_manager->priv->rr_screens, g_object_unref);
-		wacom_manager->priv->rr_screens = NULL;
+	if (wacom_manager->priv->rr_screen != NULL) {
+		g_clear_object (&wacom_manager->priv->rr_screen);
+		wacom_manager->priv->rr_screen = NULL;
 	}
 
         if (wacom_manager->priv->start_idle_id != 0)

=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
--- plugins/xrandr/gsd-xrandr-manager.c	2013-12-04 23:55:26 +0000
+++ plugins/xrandr/gsd-xrandr-manager.c	2014-03-01 03:37:38 +0000
@@ -62,7 +62,6 @@
 
 #define CONF_SCHEMA "org.gnome.settings-daemon.plugins.xrandr"
 #define CONF_KEY_DEFAULT_MONITORS_SETUP   "default-monitors-setup"
-#define CONF_KEY_DEFAULT_CONFIGURATION_FILE   "default-configuration-file"
 
 /* Number of seconds that the confirmation dialog will last before it resets the
  * RANDR configuration to its old state.
@@ -79,15 +78,6 @@
 "<node name='/org/gnome/SettingsDaemon/XRANDR'>"
 "  <interface name='org.gnome.SettingsDaemon.XRANDR_2'>"
 "    <annotation name='org.freedesktop.DBus.GLib.CSymbol' value='gsd_xrandr_manager_2'/>"
-"    <method name='ApplyConfiguration'>"
-"      <!-- transient-parent window for the confirmation dialog; use 0"
-"      for no parent -->"
-"      <arg name='parent_window_id' type='x' direction='in'/>"
-""
-"      <!-- Timestamp used to present the confirmation dialog and (in"
-"      the future) for the RANDR calls themselves -->"
-"      <arg name='timestamp' type='x' direction='in'/>"
-"    </method>"
 "    <method name='VideoModeSwitch'>"
 "       <!-- Timestamp for the RANDR call itself -->"
 "       <arg name='timestamp' type='x' direction='in'/>"
@@ -109,7 +99,6 @@
         gboolean running;
 
         UpClient *upower_client;
-        gboolean laptop_lid_is_closed;
 
         GSettings       *settings;
         GDBusNodeInfo   *introspection_data;
@@ -121,9 +110,6 @@
         int             current_fn_f7_config;             /* -1 if no configs */
         GnomeRRConfig **fn_f7_configs;  /* NULL terminated, NULL if there are no configs */
 
-        /* Last time at which we got a "screen got reconfigured" event; see on_randr_event() */
-        guint32 last_config_timestamp;
-
 #ifdef HAVE_WACOM
         WacomDeviceDatabase *wacom_db;
 #endif /* HAVE_WACOM */
@@ -251,23 +237,11 @@
                 log_msg ("        no outputs!\n");
 }
 
-static char
-timestamp_relationship (guint32 a, guint32 b)
-{
-        if (a < b)
-                return '<';
-        else if (a > b)
-                return '>';
-        else
-                return '=';
-}
-
 static void
 log_screen (GnomeRRScreen *screen)
 {
         GnomeRRConfig *config;
         int min_w, min_h, max_w, max_h;
-        guint32 change_timestamp, config_timestamp;
 
         if (!log_file)
                 return;
@@ -275,14 +249,10 @@
         config = gnome_rr_config_new_current (screen, NULL);
 
         gnome_rr_screen_get_ranges (screen, &min_w, &max_w, &min_h, &max_h);
-        gnome_rr_screen_get_timestamps (screen, &change_timestamp, &config_timestamp);
 
-        log_msg ("        Screen min(%d, %d), max(%d, %d), change=%u %c config=%u\n",
+        log_msg ("        Screen min(%d, %d), max(%d, %d)\n",
                  min_w, min_h,
-                 max_w, max_h,
-                 change_timestamp,
-                 timestamp_relationship (change_timestamp, config_timestamp),
-                 config_timestamp);
+                 max_w, max_h);
 
         log_configuration (config);
         g_object_unref (config);
@@ -305,34 +275,6 @@
 }
 
 static void
-show_timestamps_dialog (GsdXrandrManager *manager, const char *msg)
-{
-#if 1
-        return;
-#else
-        struct GsdXrandrManagerPrivate *priv = manager->priv;
-        GtkWidget *dialog;
-        guint32 change_timestamp, config_timestamp;
-        static int serial;
-
-        gnome_rr_screen_get_timestamps (priv->rw_screen, &change_timestamp, &config_timestamp);
-
-        dialog = gtk_message_dialog_new (NULL,
-                                         0,
-                                         GTK_MESSAGE_INFO,
-                                         GTK_BUTTONS_CLOSE,
-                                         "RANDR timestamps (%d):\n%s\nchange: %u\nconfig: %u",
-                                         serial++,
-                                         msg,
-                                         change_timestamp,
-                                         config_timestamp);
-        g_signal_connect (dialog, "response",
-                          G_CALLBACK (gtk_widget_destroy), NULL);
-        gtk_widget_show (dialog);
-#endif
-}
-
-static void
 print_output (GnomeRROutputInfo *info)
 {
         int x, y, width, height;
@@ -374,7 +316,7 @@
 
         rr_output = gnome_rr_screen_get_output_by_name (screen, gnome_rr_output_info_get_name (output));
 
-        return gnome_rr_output_is_laptop (rr_output);
+        return gnome_rr_output_is_builtin_display (rr_output);
 }
 
 static GnomeRROutputInfo *
@@ -391,96 +333,6 @@
         return NULL;
 }
 
-static gboolean
-non_laptop_outputs_are_active (GnomeRRConfig *config, GnomeRROutputInfo *laptop_info)
-{
-        GnomeRROutputInfo **outputs;
-        int i;
-
-        outputs = gnome_rr_config_get_outputs (config);
-        for (i = 0; outputs[i] != NULL; i++) {
-                if (outputs[i] == laptop_info)
-                        continue;
-
-                if (gnome_rr_output_info_is_active (outputs[i]))
-                        return TRUE;
-        }
-
-        return FALSE;
-}
-
-static void
-turn_off_laptop_display_in_configuration (GnomeRRScreen *screen, GnomeRRConfig *config)
-{
-        GnomeRROutputInfo *laptop_info;
-
-        laptop_info = get_laptop_output_info (screen, config);
-        if (laptop_info) {
-                /* Turn off the laptop's screen only if other displays are on.  This is to avoid an all-black-screens scenario. */
-                if (non_laptop_outputs_are_active (config, laptop_info))
-                        gnome_rr_output_info_set_active (laptop_info, FALSE);
-        }
-
-        /* Adjust the offsets of outputs so they start at (0, 0) */
-        gnome_rr_config_sanitize (config);
-}
-
-/* This function effectively centralizes the use of gnome_rr_config_apply_from_filename_with_time().
- *
- * Optionally filters out GNOME_RR_ERROR_NO_MATCHING_CONFIG from the matching
- * process(), since that is not usually an error.
- */
-static gboolean
-apply_configuration_from_filename (GsdXrandrManager *manager,
-                                   const char       *filename,
-                                   gboolean          no_matching_config_is_an_error,
-                                   guint32           timestamp,
-                                   GError          **error)
-{
-        struct GsdXrandrManagerPrivate *priv = manager->priv;
-        GnomeRRConfig *config;
-        GError *my_error;
-        gboolean success;
-        char *str;
-
-        str = g_strdup_printf ("Applying %s with timestamp %d", filename, timestamp);
-        show_timestamps_dialog (manager, str);
-        g_free (str);
-
-        my_error = NULL;
-
-        config = g_object_new (GNOME_TYPE_RR_CONFIG, "screen", priv->rw_screen, NULL);
-        if (!gnome_rr_config_load_filename (config, filename, &my_error)) {
-                g_object_unref (config);
-
-                if (g_error_matches (my_error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_MATCHING_CONFIG)) {
-                        if (no_matching_config_is_an_error) {
-                                g_propagate_error (error, my_error);
-                                return FALSE;
-                        } else {
-                                /* This is not an error; the user probably changed his monitors
-                                 * and so they don't match any of the stored configurations.
-                                 */
-                                g_error_free (my_error);
-                                return TRUE;
-                        }
-                } else {
-                        g_propagate_error (error, my_error);
-                        return FALSE;
-                }
-        }
-
-        if (up_client_get_lid_is_closed (priv->upower_client))
-                turn_off_laptop_display_in_configuration (priv->rw_screen, config);
-
-        gnome_rr_config_ensure_primary (config);
-	success = gnome_rr_config_apply_with_time (config, priv->rw_screen, timestamp, error);
-
-        g_object_unref (config);
-
-        return success;
-}
-
 /* This function centralizes the use of gnome_rr_config_apply_with_time().
  *
  * Applies a configuration and displays an error message if an error happens.
@@ -498,11 +350,12 @@
         print_configuration (config, "Applying Configuration");
 
         error = NULL;
-        success = gnome_rr_config_apply_with_time (config, priv->rw_screen, timestamp, &error);
-        if (success) {
-                if (save_configuration)
-                        gnome_rr_config_save (config, NULL); /* NULL-GError - there's not much we can do if this fails */
-        } else {
+        if (save_configuration)
+                success = gnome_rr_config_apply_persistent (config, priv->rw_screen, &error);
+        else
+                success = gnome_rr_config_apply (config, priv->rw_screen, &error);
+
+        if (!success) {
                 log_msg ("Could not switch to the following configuration (timestamp %u): %s\n", timestamp, error->message);
                 log_configuration (config);
                 if (show_error)
@@ -513,250 +366,6 @@
         return success;
 }
 
-static void
-restore_backup_configuration_without_messages (const char *backup_filename, const char *intended_filename)
-{
-        backup_filename = gnome_rr_config_get_backup_filename ();
-        rename (backup_filename, intended_filename);
-}
-
-static void
-restore_backup_configuration (GsdXrandrManager *manager, const char *backup_filename, const char *intended_filename, guint32 timestamp)
-{
-        int saved_errno;
-
-        if (rename (backup_filename, intended_filename) == 0) {
-                GError *error;
-
-                error = NULL;
-                if (!apply_configuration_from_filename (manager, intended_filename, FALSE, timestamp, &error)) {
-                        error_message (manager, _("Could not restore the display's configuration"), error, NULL);
-
-                        if (error)
-                                g_error_free (error);
-                }
-
-                return;
-        }
-
-        saved_errno = errno;
-
-        /* ENOENT means the original file didn't exist.  That is *not* an error;
-         * the backup was not created because there wasn't even an original
-         * monitors.xml (such as on a first-time login).  Note that *here* there
-         * is a "didn't work" monitors.xml, so we must delete that one.
-         */
-        if (saved_errno == ENOENT)
-                unlink (intended_filename);
-        else {
-                char *msg;
-
-                msg = g_strdup_printf ("Could not rename %s to %s: %s",
-                                       backup_filename, intended_filename,
-                                       g_strerror (saved_errno));
-                error_message (manager,
-                               _("Could not restore the display's configuration from a backup"),
-                               NULL,
-                               msg);
-                g_free (msg);
-        }
-
-        unlink (backup_filename);
-}
-
-typedef struct {
-        GsdXrandrManager *manager;
-        GtkWidget *dialog;
-
-        int countdown;
-        int response_id;
-} TimeoutDialog;
-
-static void
-print_countdown_text (TimeoutDialog *timeout)
-{
-        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (timeout->dialog),
-                                                  ngettext ("The display will be reset to its previous configuration in %d second",
-                                                            "The display will be reset to its previous configuration in %d seconds",
-                                                            timeout->countdown),
-                                                  timeout->countdown);
-}
-
-static gboolean
-timeout_cb (gpointer data)
-{
-        TimeoutDialog *timeout = data;
-
-        timeout->countdown--;
-
-        if (timeout->countdown == 0) {
-                timeout->response_id = GTK_RESPONSE_CANCEL;
-                gtk_main_quit ();
-        } else {
-                print_countdown_text (timeout);
-        }
-
-        return TRUE;
-}
-
-static void
-timeout_response_cb (GtkDialog *dialog, int response_id, gpointer data)
-{
-        TimeoutDialog *timeout = data;
-
-        if (response_id == GTK_RESPONSE_DELETE_EVENT) {
-                /* The user closed the dialog or pressed ESC, revert */
-                timeout->response_id = GTK_RESPONSE_CANCEL;
-        } else
-                timeout->response_id = response_id;
-
-        gtk_main_quit ();
-}
-
-static gboolean
-user_says_things_are_ok (GsdXrandrManager *manager, GdkWindow *parent_window)
-{
-        TimeoutDialog timeout;
-        guint timeout_id;
-
-        timeout.manager = manager;
-
-        timeout.dialog = gtk_message_dialog_new (NULL,
-                                                 GTK_DIALOG_MODAL,
-                                                 GTK_MESSAGE_QUESTION,
-                                                 GTK_BUTTONS_NONE,
-                                                 _("Does the display look OK?"));
-
-        timeout.countdown = CONFIRMATION_DIALOG_SECONDS;
-
-        print_countdown_text (&timeout);
-
-        gtk_window_set_icon_name (GTK_WINDOW (timeout.dialog), "preferences-desktop-display");
-        gtk_dialog_add_button (GTK_DIALOG (timeout.dialog), _("_Restore Previous Configuration"), GTK_RESPONSE_CANCEL);
-        gtk_dialog_add_button (GTK_DIALOG (timeout.dialog), _("_Keep This Configuration"), GTK_RESPONSE_ACCEPT);
-        gtk_dialog_set_default_response (GTK_DIALOG (timeout.dialog), GTK_RESPONSE_ACCEPT); /* ah, the optimism */
-
-        g_signal_connect (timeout.dialog, "response",
-                          G_CALLBACK (timeout_response_cb),
-                          &timeout);
-
-        gtk_widget_realize (timeout.dialog);
-
-        if (parent_window)
-                gdk_window_set_transient_for (gtk_widget_get_window (timeout.dialog), parent_window);
-
-        gtk_widget_show_all (timeout.dialog);
-        /* We don't use g_timeout_add_seconds() since we actually care that the user sees "real" second ticks in the dialog */
-        timeout_id = g_timeout_add (1000,
-                                    timeout_cb,
-                                    &timeout);
-        gtk_main ();
-
-        gtk_widget_destroy (timeout.dialog);
-        g_source_remove (timeout_id);
-
-        if (timeout.response_id == GTK_RESPONSE_ACCEPT)
-                return TRUE;
-        else
-                return FALSE;
-}
-
-struct confirmation {
-        GsdXrandrManager *manager;
-        GdkWindow *parent_window;
-        guint32 timestamp;
-};
-
-static gboolean
-confirm_with_user_idle_cb (gpointer data)
-{
-        struct confirmation *confirmation = data;
-        char *backup_filename;
-        char *intended_filename;
-
-        backup_filename = gnome_rr_config_get_backup_filename ();
-        intended_filename = gnome_rr_config_get_intended_filename ();
-
-        if (user_says_things_are_ok (confirmation->manager, confirmation->parent_window))
-                unlink (backup_filename);
-        else
-                restore_backup_configuration (confirmation->manager, backup_filename, intended_filename, confirmation->timestamp);
-
-        g_free (confirmation);
-
-        return FALSE;
-}
-
-static void
-queue_confirmation_by_user (GsdXrandrManager *manager, GdkWindow *parent_window, guint32 timestamp)
-{
-        struct confirmation *confirmation;
-
-        confirmation = g_new (struct confirmation, 1);
-        confirmation->manager = manager;
-        confirmation->parent_window = parent_window;
-        confirmation->timestamp = timestamp;
-
-        g_idle_add (confirm_with_user_idle_cb, confirmation);
-}
-
-static gboolean
-try_to_apply_intended_configuration (GsdXrandrManager *manager, GdkWindow *parent_window, guint32 timestamp, GError **error)
-{
-        char *backup_filename;
-        char *intended_filename;
-        gboolean result;
-
-        /* Try to apply the intended configuration */
-
-        backup_filename = gnome_rr_config_get_backup_filename ();
-        intended_filename = gnome_rr_config_get_intended_filename ();
-
-        result = apply_configuration_from_filename (manager, intended_filename, FALSE, timestamp, error);
-        if (!result) {
-                error_message (manager, _("The selected configuration for displays could not be applied"), error ? *error : NULL, NULL);
-                restore_backup_configuration_without_messages (backup_filename, intended_filename);
-                goto out;
-        } else {
-                /* We need to return as quickly as possible, so instead of
-                 * confirming with the user right here, we do it in an idle
-                 * handler.  The caller only expects a status for "could you
-                 * change the RANDR configuration?", not "is the user OK with it
-                 * as well?".
-                 */
-                queue_confirmation_by_user (manager, parent_window, timestamp);
-        }
-
-out:
-        g_free (backup_filename);
-        g_free (intended_filename);
-
-        return result;
-}
-
-/* DBus method for org.gnome.SettingsDaemon.XRANDR_2 ApplyConfiguration; see gsd-xrandr-manager.xml for the interface definition */
-static gboolean
-gsd_xrandr_manager_2_apply_configuration (GsdXrandrManager *manager,
-                                          gint64            parent_window_id,
-                                          gint64            timestamp,
-                                          GError          **error)
-{
-        GdkWindow *parent_window;
-        gboolean result;
-
-        if (parent_window_id != 0)
-                parent_window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), (Window) parent_window_id);
-        else
-                parent_window = NULL;
-
-        result = try_to_apply_intended_configuration (manager, parent_window, (guint32) timestamp, error);
-
-        if (parent_window)
-                g_object_unref (parent_window);
-
-        return result;
-}
-
 /* DBus method for org.gnome.SettingsDaemon.XRANDR_2 VideoModeSwitch; see gsd-xrandr-manager.xml for the interface definition */
 static gboolean
 gsd_xrandr_manager_2_video_mode_switch (GsdXrandrManager *manager,
@@ -1402,7 +1011,6 @@
         g_object_unref (current);
 
         if (priv->fn_f7_configs) {
-                guint32 server_timestamp;
                 gboolean success;
 
                 mgr->priv->current_fn_f7_config++;
@@ -1416,22 +1024,6 @@
 
                 g_debug ("applying");
 
-                /* See https://bugzilla.gnome.org/show_bug.cgi?id=610482
-                 *
-                 * Sometimes we'll get two rapid XF86Display keypress events,
-                 * but their timestamps will be out of order with respect to the
-                 * RANDR timestamps.  This *may* be due to stupid BIOSes sending
-                 * out display-switch keystrokes "to make Windows work".
-                 *
-                 * The X server will error out if the timestamp provided is
-                 * older than a previous change configuration timestamp. We
-                 * assume here that we do want this event to go through still,
-                 * since kernel timestamps may be skewed wrt the X server.
-                 */
-                gnome_rr_screen_get_timestamps (screen, NULL, &server_timestamp);
-                if (timestamp < server_timestamp)
-                        timestamp = server_timestamp;
-
                 success = apply_configuration (mgr, priv->fn_f7_configs[mgr->priv->current_fn_f7_config], timestamp, TRUE, TRUE);
 
                 if (success) {
@@ -1674,153 +1266,6 @@
         g_object_unref (current);
 }
 
-static GnomeRRConfig *
-make_default_setup (GsdXrandrManager *manager)
-{
-        GsdXrandrManagerPrivate *priv = manager->priv;
-        GnomeRRConfig *config;
-        GsdXrandrBootBehaviour boot;
-
-        boot = g_settings_get_enum (priv->settings, CONF_KEY_DEFAULT_MONITORS_SETUP);
-        g_debug ("xrandr default monitors setup: %d\n", boot);
-
-        switch (boot) {
-        case GSD_XRANDR_BOOT_BEHAVIOUR_DO_NOTHING:
-                config = make_xinerama_setup (manager, priv->rw_screen);
-                break;
-        case GSD_XRANDR_BOOT_BEHAVIOUR_FOLLOW_LID:
-                if (laptop_lid_is_closed (manager))
-                        config = make_other_setup (priv->rw_screen);
-                else
-                        config = make_xinerama_setup (manager, priv->rw_screen);
-                break;
-        case GSD_XRANDR_BOOT_BEHAVIOUR_CLONE:
-                config = make_clone_setup (manager, priv->rw_screen);
-                break;
-        case GSD_XRANDR_BOOT_BEHAVIOUR_DOCK:
-                config = make_other_setup (priv->rw_screen);
-                break;
-        default:
-                g_assert_not_reached ();
-        }
-
-        return config;
-}
-
-static void
-auto_configure_outputs (GsdXrandrManager *manager, guint32 timestamp)
-{
-        GnomeRRConfig *config;
-
-        g_debug ("xrandr auto-configure");
-        config = make_default_setup (manager);
-        if (config) {
-                apply_configuration (manager, config, timestamp, TRUE, FALSE);
-                g_object_unref (config);
-        } else {
-                g_debug ("No applicable configuration found during auto-configure");
-        }
-}
-
-static void
-use_stored_configuration_or_auto_configure_outputs (GsdXrandrManager *manager, guint32 timestamp)
-{
-        GsdXrandrManagerPrivate *priv = manager->priv;
-        char *intended_filename;
-        GError *error;
-        gboolean success;
-
-        intended_filename = gnome_rr_config_get_intended_filename ();
-
-        error = NULL;
-        success = apply_configuration_from_filename (manager, intended_filename, TRUE, timestamp, &error);
-        g_free (intended_filename);
-
-        if (!success) {
-                /* We don't bother checking the error type.
-                 *
-                 * Both G_FILE_ERROR_NOENT and
-                 * GNOME_RR_ERROR_NO_MATCHING_CONFIG would mean, "there
-                 * was no configuration to apply, or none that matched
-                 * the current outputs", and in that case we need to run
-                 * our fallback.
-                 *
-                 * Any other error means "we couldn't do the smart thing
-                 * of using a previously- saved configuration, anyway,
-                 * for some other reason.  In that case, we also need to
-                 * run our fallback to avoid leaving the user with a
-                 * bogus configuration.
-                 */
-
-                if (error)
-                        g_error_free (error);
-
-                if (timestamp != priv->last_config_timestamp || timestamp == GDK_CURRENT_TIME) {
-                        priv->last_config_timestamp = timestamp;
-                        auto_configure_outputs (manager, timestamp);
-                        log_msg ("  Automatically configured outputs\n");
-                } else
-                        log_msg ("  Ignored autoconfiguration as old and new config timestamps are the same\n");
-        } else
-                log_msg ("Applied stored configuration\n");
-}
-
-static void
-on_randr_event (GnomeRRScreen *screen, gpointer data)
-{
-        GsdXrandrManager *manager = GSD_XRANDR_MANAGER (data);
-        GsdXrandrManagerPrivate *priv = manager->priv;
-        guint32 change_timestamp, config_timestamp;
-
-        if (!priv->running)
-                return;
-
-        gnome_rr_screen_get_timestamps (screen, &change_timestamp, &config_timestamp);
-
-        log_open ();
-        log_msg ("Got RANDR event with timestamps change=%u %c config=%u\n",
-                 change_timestamp,
-                 timestamp_relationship (change_timestamp, config_timestamp),
-                 config_timestamp);
-
-        if (change_timestamp >= config_timestamp) {
-                GnomeRRConfig *rr_config;
-
-                /* The event is due to an explicit configuration change.
-                 *
-                 * If the change was performed by us, then we need to do nothing.
-                 *
-                 * If the change was done by some other X client, we don't need
-                 * to do anything, either; the screen is already configured.
-                 */
-
-                /* Check if we need to update the primary */
-                rr_config = gnome_rr_config_new_current (priv->rw_screen, NULL);
-                if (gnome_rr_config_ensure_primary (rr_config)) {
-                        if (gnome_rr_config_applicable (rr_config, priv->rw_screen, NULL)) {
-                                print_configuration (rr_config, "Updating for primary");
-                                priv->last_config_timestamp = config_timestamp;
-                                gnome_rr_config_apply_with_time (rr_config, priv->rw_screen, config_timestamp, NULL);
-                        }
-                }
-                g_object_unref (rr_config);
-
-                show_timestamps_dialog (manager, "ignoring since change > config");
-                log_msg ("  Ignoring event since change >= config\n");
-        } else {
-                /* Here, config_timestamp > change_timestamp.  This means that
-                 * the screen got reconfigured because of hotplug/unplug; the X
-                 * server is just notifying us, and we need to configure the
-                 * outputs in a sane way.
-                 */
-
-                show_timestamps_dialog (manager, "need to deal with reconfiguration, as config > change");
-                use_stored_configuration_or_auto_configure_outputs (manager, config_timestamp);
-        }
-
-        log_close ();
-}
-
 static void
 get_allowed_rotations_for_output (GnomeRRConfig *config,
                                   GnomeRRScreen *rr_screen,
@@ -1860,177 +1305,34 @@
         }
 }
 
-static gboolean
-apply_intended_configuration (GsdXrandrManager *manager, const char *intended_filename, guint32 timestamp)
-{
-        GError *my_error;
-        gboolean result;
-
-        my_error = NULL;
-        result = apply_configuration_from_filename (manager, intended_filename, TRUE, timestamp, &my_error);
-        if (!result) {
-                if (my_error) {
-                        if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT) &&
-                            !g_error_matches (my_error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_MATCHING_CONFIG))
-                                error_message (manager, _("Could not apply the stored configuration for monitors"), my_error, NULL);
-
-                        g_error_free (my_error);
-                }
-        }
-
-        return result;
-}
-
 static void
-apply_default_boot_configuration (GsdXrandrManager *mgr, guint32 timestamp)
+on_rr_screen_acquired (GObject      *object,
+                       GAsyncResult *result,
+                       gpointer      user_data)
 {
-        GsdXrandrManagerPrivate *priv = mgr->priv;
-        GnomeRRConfig *config;
-        GsdXrandrBootBehaviour boot;
-
-        boot = g_settings_get_enum (priv->settings, CONF_KEY_DEFAULT_MONITORS_SETUP);
-
-        if (boot == GSD_XRANDR_BOOT_BEHAVIOUR_DO_NOTHING)
+        GsdXrandrManager *manager = user_data;
+        GError *error = NULL;
+
+        manager->priv->rw_screen = gnome_rr_screen_new_finish (result, NULL);
+
+        if (manager->priv->rw_screen == NULL) {
+                log_msg ("Could not initialize the RANDR plugin: %s\n",
+                         error->message);
+                g_error_free (error);
+                log_close ();
                 return;
-
-        config = make_default_setup (mgr);
-        if (config) {
-                /* We don't save the configuration (the "false" parameter to the following function) because we don't want to
-                 * install a user-side setting when *here* we are using a system-default setting.
-                 */
-                apply_configuration (mgr, config, timestamp, TRUE, FALSE);
-                g_object_unref (config);
-        }
-}
-
-static gboolean
-apply_stored_configuration_at_startup (GsdXrandrManager *manager, guint32 timestamp)
-{
-        GError *my_error;
-        gboolean success;
-        char *backup_filename;
-        char *intended_filename;
-        GnomePnpIds *pnp_ids;
-
-        /* This avoids the GnomePnpIds object being created multiple times.
-         * See c9240e8b69c5833074508b46bc56307aac12ec19 */
-        pnp_ids = gnome_pnp_ids_new ();
-        backup_filename = gnome_rr_config_get_backup_filename ();
-        intended_filename = gnome_rr_config_get_intended_filename ();
-
-        /* 1. See if there was a "saved" configuration.  If there is one, it means
-         * that the user had selected to change the display configuration, but the
-         * machine crashed.  In that case, we'll apply *that* configuration and save it on top of the
-         * "intended" one.
-         */
-
-        my_error = NULL;
-
-        success = apply_configuration_from_filename (manager, backup_filename, FALSE, timestamp, &my_error);
-        if (success) {
-                /* The backup configuration existed, and could be applied
-                 * successfully, so we must restore it on top of the
-                 * failed/intended one.
-                 */
-                restore_backup_configuration (manager, backup_filename, intended_filename, timestamp);
-                goto out;
-        }
-
-        if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-                /* Epic fail:  there (probably) was a backup configuration, but
-                 * we could not apply it.  The only thing we can do is delete
-                 * the backup configuration.  Let's hope that the user doesn't
-                 * get left with an unusable display...
-                 */
-
-                unlink (backup_filename);
-                goto out;
-        }
-
-        /* 2. There was no backup configuration!  This means we are
-         * good.  Apply the intended configuration instead.
-         */
-
-        success = apply_intended_configuration (manager, intended_filename, timestamp);
-
-out:
-	g_object_unref (pnp_ids);
-
-        if (my_error)
-                g_error_free (my_error);
-
-        g_free (backup_filename);
-        g_free (intended_filename);
-
-        return success;
-}
-
-static gboolean
-apply_default_configuration_from_file (GsdXrandrManager *manager, guint32 timestamp)
-{
-        GsdXrandrManagerPrivate *priv = manager->priv;
-        char *default_config_filename;
-        gboolean result;
-
-        default_config_filename = g_settings_get_string (priv->settings, CONF_KEY_DEFAULT_CONFIGURATION_FILE);
-        if (!default_config_filename)
-                return FALSE;
-
-        result = apply_configuration_from_filename (manager, default_config_filename, TRUE, timestamp, NULL);
-
-        g_free (default_config_filename);
-        return result;
-}
-
-static void
-turn_off_laptop_display (GsdXrandrManager *manager, guint32 timestamp)
-{
-        GsdXrandrManagerPrivate *priv = manager->priv;
-        GnomeRRConfig *config;
-        
-        config = gnome_rr_config_new_current (priv->rw_screen, NULL);
-
-        turn_off_laptop_display_in_configuration (priv->rw_screen, config);
-
-        /* We don't turn the laptop's display off if it is the only display present. */
-        if (!config_is_all_off (config)) {
-                /* We don't save the configuration (the "false" parameter to the following function) because we
-                 * wouldn't want to restore a configuration with the laptop's display turned off, if at some
-                 * point later the user booted his laptop with the lid open.
-                 */
-                apply_configuration (manager, config, timestamp, FALSE, FALSE);
-        }
-
-        g_object_unref (config);
-}
-
-static void
-power_client_changed_cb (UpClient *client, gpointer data)
-{
-        GsdXrandrManager *manager = data;
-        GsdXrandrManagerPrivate *priv = manager->priv;
-        gboolean is_closed;
-
-        is_closed = up_client_get_lid_is_closed (priv->upower_client);
-
-        if (is_closed != priv->laptop_lid_is_closed) {
-                priv->laptop_lid_is_closed = is_closed;
-                if (!follow_laptop_lid(manager))
-                        return;
-
-                /* Refresh the RANDR state.  The lid just got opened/closed, so we can afford to
-                 * probe the outputs right now.  It will also help the case where we can't detect
-                 * hotplug/unplug, but the fact that the lid's state changed lets us know that the
-                 * user probably did something interesting.
-                 */
-
-                gnome_rr_screen_refresh (priv->rw_screen, NULL); /* NULL-GError */
-
-                if (is_closed)
-                        turn_off_laptop_display (manager, GDK_CURRENT_TIME); /* sucks not to have a timestamp for the notification */
-                else
-                        use_stored_configuration_or_auto_configure_outputs (manager, GDK_CURRENT_TIME);
-        }
+       
+        }
+
+        manager->priv->upower_client = up_client_new ();
+
+        log_msg ("State of screen at startup:\n");
+        log_screen (manager->priv->rw_screen);
+
+        manager->priv->running = TRUE;
+        manager->priv->settings = g_settings_new (CONF_SCHEMA);
+
+        log_close ();
 }
 
 gboolean
@@ -2043,38 +1345,8 @@
         log_open ();
         log_msg ("------------------------------------------------------------\nSTARTING XRANDR PLUGIN\n");
 
-        manager->priv->rw_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
-
-        if (manager->priv->rw_screen == NULL) {
-                log_msg ("Could not initialize the RANDR plugin%s%s\n",
-                         (error && *error) ? ": " : "",
-                         (error && *error) ? (*error)->message : "");
-                log_close ();
-                return FALSE;
-        }
-
-        g_signal_connect (manager->priv->rw_screen, "changed", G_CALLBACK (on_randr_event), manager);
-
-        manager->priv->upower_client = up_client_new ();
-        manager->priv->laptop_lid_is_closed = up_client_get_lid_is_closed (manager->priv->upower_client);
-        g_signal_connect (manager->priv->upower_client, "changed",
-                          G_CALLBACK (power_client_changed_cb), manager);
-
-        log_msg ("State of screen at startup:\n");
-        log_screen (manager->priv->rw_screen);
-
-        manager->priv->running = TRUE;
-        manager->priv->settings = g_settings_new (CONF_SCHEMA);
-
-        show_timestamps_dialog (manager, "Startup");
-        if (!apply_stored_configuration_at_startup (manager, GDK_CURRENT_TIME)) /* we don't have a real timestamp at startup anyway */
-                if (!apply_default_configuration_from_file (manager, GDK_CURRENT_TIME))
-                        apply_default_boot_configuration (manager, GDK_CURRENT_TIME);
-
-        log_msg ("State of screen after initial configuration:\n");
-        log_screen (manager->priv->rw_screen);
-
-        log_close ();
+        gnome_rr_screen_new_async (gdk_screen_get_default (),
+                                   on_rr_screen_acquired, manager);
 
         gnome_settings_profile_end (NULL);
 
@@ -2186,21 +1458,10 @@
                              GDBusMethodInvocation *invocation)
 {
         gint64 timestamp;
-        GError *error = NULL;
 
         g_debug ("Calling method '%s' for org.gnome.SettingsDaemon.XRANDR_2", method_name);
 
-        if (g_strcmp0 (method_name, "ApplyConfiguration") == 0) {
-                gint64 parent_window_id;
-
-                g_variant_get (parameters, "(xx)", &parent_window_id, &timestamp);
-                if (gsd_xrandr_manager_2_apply_configuration (manager, parent_window_id,
-                                                              clamp_timestamp(timestamp), &error) == FALSE) {
-                        g_dbus_method_invocation_return_gerror (invocation, error);
-                } else {
-                        g_dbus_method_invocation_return_value (invocation, NULL);
-                }
-        } else if (g_strcmp0 (method_name, "VideoModeSwitch") == 0) {
+        if (g_strcmp0 (method_name, "VideoModeSwitch") == 0) {  
                 g_variant_get (parameters, "(x)", &timestamp);
                 gsd_xrandr_manager_2_video_mode_switch (manager, clamp_timestamp(timestamp), NULL);
                 g_dbus_method_invocation_return_value (invocation, NULL);