summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2009-05-31 19:02:33 -0500
committerFederico Mena Quintero <federico@novell.com>2009-06-08 20:01:12 -0500
commit88ac4db5b130228d8f399d079b418cf0406ccc45 (patch)
tree3cd7bbbc150851a9fc40bb1f6de6247cc4d921e9
parentf2d2c756cbcdc6e3bf7bf093201c1a82dcd40764 (diff)
downloadgnome-settings-daemon-randr-hotplug.tar.gz
Disable launching the display capplet at the end of the auto-configuration processrandr-hotplug
The display capplet is not a single-instance app. We have no way to detect if the capplet is already running; if the user plugs an extra monitor and hits 'Detect displays', then we should not bring up another instance of the display capplet when we get the RANDR event. Signed-off-by: Federico Mena Quintero <federico@novell.com>
-rw-r--r--plugins/xrandr/gsd-xrandr-manager.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index e6394bcc..496d9a78 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -1006,7 +1006,22 @@ auto_configure_outputs (GsdXrandrManager *manager, guint32 timestamp)
* liking.
*/
+#if 0
+ /* FIXME: This is disabled for now. The capplet is not a single-instance application.
+ * If you do this:
+ *
+ * 1. Start the display capplet
+ *
+ * 2. Plug an extra monitor
+ *
+ * 3. Hit the "Detect displays" button
+ *
+ * Then we will get a RANDR event because X re-probes the outputs. We don't want to
+ * start up a second display capplet right there!
+ */
+
run_display_capplet (NULL);
+#endif
}
static void