[mutter] monitor-manager: Don't cancel confirm dialog on verifying
- From: Jonas Ã…dahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] monitor-manager: Don't cancel confirm dialog on verifying
- Date: Mon, 21 Aug 2017 13:25:26 +0000 (UTC)
commit 6584d06bb5a1329567985feb43c77bffe2038177
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Fri Aug 11 14:59:44 2017 +0800
monitor-manager: Don't cancel confirm dialog on verifying
When another D-Bus call that just tries to verify a configuration is
made, don't cancel any active monitor configuration dialog, as doing so
would effectively confirm queried configuration.
https://bugzilla.gnome.org/show_bug.cgi?id=786023
src/backends/meta-monitor-manager.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index aa945a4..253b83a 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -1965,7 +1965,8 @@ meta_monitor_manager_handle_apply_monitors_config (MetaDBusDisplayConfig *skelet
return TRUE;
}
- if (manager->persistent_timeout_id)
+ if (manager->persistent_timeout_id &&
+ method != META_MONITORS_CONFIG_METHOD_VERIFY)
cancel_persistent_confirmation (manager);
if (!meta_monitor_manager_apply_monitors_config (manager,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]