[mutter] monitor-manager: add API to get the display configuration timeout

[Cosimo Cecchi <cosimoc src gnome org>]

commit 1455c402b9e0f3251c7fe9b432d94f10d9bd051d
Author: Cosimo Cecchi <cosimo endlessm com>
Date:   Wed Aug 20 17:07:13 2014 -0700

    monitor-manager: add API to get the display configuration timeout
    
    Instead of hardcoding this into two different places, add an API so that
    gnome-shell can fetch it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767805

 src/backends/meta-monitor-manager.c |   10 +++++++++-
 src/meta/meta-monitor-manager.h     |    2 ++
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 12eb16d..13acf05 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -44,6 +44,8 @@
 #include "backends/x11/meta-monitor-manager-xrandr.h"
 #include "meta-backend-private.h"
 
+#define DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT 20
+
 enum {
   CONFIRM_DISPLAY_CHANGE,
   SIGNALS_LAST
@@ -1245,6 +1247,12 @@ restore_previous_config (MetaMonitorManager *manager)
   meta_monitor_manager_ensure_configured (manager);
 }
 
+gint
+meta_monitor_manager_get_display_configuration_timeout (void)
+{
+  return DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT;
+}
+
 static gboolean
 save_config_timeout (gpointer user_data)
 {
@@ -1276,7 +1284,7 @@ request_persistent_confirmation (MetaMonitorManager     *manager,
                                  MetaMonitorConfigSystem system)
 {
   manager->pending_persistent_system = system;
-  manager->persistent_timeout_id = g_timeout_add_seconds (20,
+  manager->persistent_timeout_id = g_timeout_add_seconds 
(meta_monitor_manager_get_display_configuration_timeout (),
                                                           save_config_timeout,
                                                           manager);
   g_source_set_name_by_id (manager->persistent_timeout_id,
diff --git a/src/meta/meta-monitor-manager.h b/src/meta/meta-monitor-manager.h
index 22f7349..81f8605 100644
--- a/src/meta/meta-monitor-manager.h
+++ b/src/meta/meta-monitor-manager.h
@@ -55,4 +55,6 @@ gboolean meta_monitor_manager_can_switch_config (MetaMonitorManager *manager);
 
 MetaMonitorSwitchConfigType meta_monitor_manager_get_switch_config (MetaMonitorManager *manager);
 
+gint meta_monitor_manager_get_display_configuration_timeout (void);
+
 #endif /* META_MONITOR_MANAGER_H */