From 5da7f7c6ef1e59bba1f3aa7fa24fcaa44187704e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 12 Oct 2010 15:53:30 +0200 Subject: Revert "Fix launching the display configuration tool" In 2.32, we still want to use mate-display-properties. This reverts commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee. --- plugins/xrandr/msd-xrandr-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/xrandr/msd-xrandr-manager.c') diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index dc00be1..e74b7d9 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -77,7 +77,7 @@ #define MSD_XRANDR_ICON_NAME "msd-xrandr" /* executable of the control center's display configuration capplet */ -#define MSD_XRANDR_DISPLAY_CAPPLET "mate-control-center display" +#define MSD_XRANDR_DISPLAY_CAPPLET "mate-display-properties" #define MSD_DBUS_PATH "/org/mate/SettingsDaemon" #define MSD_DBUS_NAME "org.mate.SettingsDaemon" -- cgit v1.2.1 From 60b0ab065772c3f109d7471c0d6d814d477f9803 Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Fri, 29 Oct 2010 12:31:07 -0500 Subject: (randr) bnc#647304 - If the stored configuration fails at startup, use the fallback configurations Previously, if a stored configuration existed but it could not be applied due to nonmatching monitors, we would do nothing else - potentially leaving the user in whatever startup state was used by the X server. Now, in that condition we simply fall back to trying the system-global configuration or the boot-time configuration. Signed-off-by: Federico Mena Quintero --- plugins/xrandr/msd-xrandr-manager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins/xrandr/msd-xrandr-manager.c') diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index e74b7d9..75e41dd 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -2168,10 +2168,11 @@ apply_intended_configuration (MsdXrandrManager *manager, const char *intended_fi gboolean result; my_error = NULL; - result = apply_configuration_from_filename (manager, intended_filename, FALSE, timestamp, &my_error); + 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)) + if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT) && + !g_error_matches (my_error, MATE_RR_ERROR, MATE_RR_ERROR_NO_MATCHING_CONFIG)) error_message (manager, _("Could not apply the stored configuration for monitors"), my_error, NULL); g_error_free (my_error); -- cgit v1.2.1 From a525db8f795d2101969a47f06c9fb6b60a497fb3 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 5 Oct 2010 11:30:46 +0200 Subject: RANDR - Add mateconf key for disabling boot time configuration In a lot of situations it is undesirable to have g-s-d change the XRandR settings, because it overrides X.org customizations, leads to unnecessary mode switches, or increases boot time. Add a mateconf key "use_xorg_monitor_settings" to disable apply_default_boot_configuration(), in which case the XRandR configuration will not be touched unless there is a global or per-user configuration file. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=631388 Bug-Ubuntu: https://launchpad.net/bugs/640807 --- plugins/xrandr/msd-xrandr-manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins/xrandr/msd-xrandr-manager.c') diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index 75e41dd..7d8d7f5 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -61,6 +61,7 @@ #define CONF_DIR "/apps/mate_settings_daemon/xrandr" #define CONF_KEY_SHOW_NOTIFICATION_ICON (CONF_DIR "/show_notification_icon") +#define CONF_KEY_USE_XORG_MONITOR_SETTINGS (CONF_DIR "/use_xorg_monitor_settings") #define CONF_KEY_TURN_ON_EXTERNAL_MONITORS_AT_STARTUP (CONF_DIR "/turn_on_external_monitors_at_startup") #define CONF_KEY_TURN_ON_LAPTOP_MONITOR_AT_STARTUP (CONF_DIR "/turn_on_laptop_monitor_at_startup") #define CONF_KEY_DEFAULT_CONFIGURATION_FILE (CONF_DIR "/default_configuration_file") @@ -2350,7 +2351,8 @@ msd_xrandr_manager_start (MsdXrandrManager *manager, 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); + if (!mateconf_client_get_bool (manager->priv->client, CONF_KEY_USE_XORG_MONITOR_SETTINGS, NULL)) + apply_default_boot_configuration (manager, GDK_CURRENT_TIME); log_msg ("State of screen after initial configuration:\n"); log_screen (manager->priv->rw_screen); -- cgit v1.2.1