File gnome-settings-daemon-bnc510094-randr-confirmat... of Package gnome-settings-daemon

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-settings-daemon-bnc510094-randr-confirmation-in-idle.diff of Package gnome-settings-daemon

From 6c5eb5b5a608df8446b1291f3b12a6deaf7cd83c Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Mon, 15 Jun 2009 15:05:00 -0500
Subject: [PATCH] randr - don't take too long in the D-Bus method implementations

We used to pop up the confirmation dialog from within the D-Bus method implementations.  Since the
timeout for the confirmation dialog is longer than the D-Bus timeout, this could cause the user
to see an error similar to 'did not receive a reply'.

Now we do the confirmation dialog in an idle handler so that we don't block the D-Bus methods.

Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
 plugins/xrandr/gsd-xrandr-manager.c |   55 +++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 496d9a7..da7a62c 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -296,7 +296,6 @@ user_says_things_are_ok (GsdXrandrManager *manager, GdkWindow *parent_window)
 
         timeout.manager = manager;
 
-        /* It sucks that we don't know the parent window here */
         timeout.dialog = gtk_message_dialog_new (NULL,
                                                  GTK_DIALOG_MODAL,
                                                  GTK_MESSAGE_QUESTION,
@@ -336,6 +335,45 @@ user_says_things_are_ok (GsdXrandrManager *manager, GdkWindow *parent_window)
                 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)
 {
@@ -353,15 +391,16 @@ try_to_apply_intended_configuration (GsdXrandrManager *manager, GdkWindow *paren
                 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);
         }
 
-        /* Confirm with the user */
-
-        if (user_says_things_are_ok (manager, parent_window))
-                unlink (backup_filename);
-        else
-                restore_backup_configuration (manager, backup_filename, intended_filename, timestamp);
-
 out:
         g_free (backup_filename);
         g_free (intended_filename);
-- 
1.6.0.2

Places

File gnome-settings-daemon-bnc510094-randr-confirmation-in-idle.diff of Package gnome-settings-daemon

Places