[mutter] monitor-manager: Rename read_current_config to read_current_state

[Jonas Ådahl <jadahl src gnome org>]

commit c041851fa57b45e165903b08a74fe2b9c71d112b
Author: Jonas Ådahl <jadahl gmail com>
Date:   Mon Dec 19 15:46:31 2016 +0800

    monitor-manager: Rename read_current_config to read_current_state
    
    The function meta_monitor_manager_read_current_config() was renamed to
    meta_monitor_manager_read_current_state() as it does not read any
    configuration, but reads the current state as described by the backend.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777732

 src/backends/meta-monitor-manager-private.h    |    2 +-
 src/backends/meta-monitor-manager.c            |    6 +++---
 src/backends/native/meta-monitor-manager-kms.c |    2 +-
 src/backends/x11/meta-monitor-manager-xrandr.c |    2 +-
 src/tests/meta-monitor-manager-test.c          |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/backends/meta-monitor-manager-private.h b/src/backends/meta-monitor-manager-private.h
index 92cc156..9c2a915 100644
--- a/src/backends/meta-monitor-manager-private.h
+++ b/src/backends/meta-monitor-manager-private.h
@@ -388,7 +388,7 @@ void               meta_crtc_info_free   (MetaCrtcInfo   *info);
 void               meta_output_info_free (MetaOutputInfo *info);
 
 gboolean           meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager);
-void               meta_monitor_manager_read_current_config (MetaMonitorManager *manager);
+void               meta_monitor_manager_read_current_state (MetaMonitorManager *manager);
 void               meta_monitor_manager_on_hotplug (MetaMonitorManager *manager);
 
 gboolean           meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 33bd7fd..088d992 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -219,7 +219,7 @@ meta_monitor_manager_constructed (GObject *object)
 
   manager->legacy_config = meta_monitor_config_new ();
 
-  meta_monitor_manager_read_current_config (manager);
+  meta_monitor_manager_read_current_state (manager);
 
   legacy_ensure_configured (manager);
 
@@ -231,7 +231,7 @@ meta_monitor_manager_constructed (GObject *object)
      so this is not needed.
   */
   if (META_IS_MONITOR_MANAGER_XRANDR (manager))
-    meta_monitor_manager_read_current_config (manager);
+    meta_monitor_manager_read_current_state (manager);
 
   make_logical_config (manager);
   initialize_dbus_interface (manager);
@@ -1466,7 +1466,7 @@ meta_monitor_manager_tiled_monitor_removed (MetaMonitorManager *manager,
 }
 
 void
-meta_monitor_manager_read_current_config (MetaMonitorManager *manager)
+meta_monitor_manager_read_current_state (MetaMonitorManager *manager)
 {
   MetaOutput *old_outputs;
   MetaCrtc *old_crtcs;
diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c
index a7912ed..ebd8492 100644
--- a/src/backends/native/meta-monitor-manager-kms.c
+++ b/src/backends/native/meta-monitor-manager-kms.c
@@ -1472,7 +1472,7 @@ on_uevent (GUdevClient *client,
   if (!g_udev_device_get_property_as_boolean (device, "HOTPLUG"))
     return;
 
-  meta_monitor_manager_read_current_config (manager);
+  meta_monitor_manager_read_current_state (manager);
 
   meta_monitor_manager_on_hotplug (manager);
 }
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
index d77661a..b5a130d 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -1597,7 +1597,7 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
 
   XRRUpdateConfiguration (event);
 
-  meta_monitor_manager_read_current_config (manager);
+  meta_monitor_manager_read_current_state (manager);
 
   hotplug = manager_xrandr->resources->timestamp < manager_xrandr->resources->configTimestamp;
   if (hotplug)
diff --git a/src/tests/meta-monitor-manager-test.c b/src/tests/meta-monitor-manager-test.c
index 222d19b..a89b2cf 100644
--- a/src/tests/meta-monitor-manager-test.c
+++ b/src/tests/meta-monitor-manager-test.c
@@ -51,7 +51,7 @@ meta_monitor_manager_test_emulate_hotplug (MetaMonitorManagerTest *manager_test,
   old_test_setup = manager_test->test_setup;
   manager_test->test_setup = test_setup;
 
-  meta_monitor_manager_read_current_config (manager);
+  meta_monitor_manager_read_current_state (manager);
   meta_monitor_manager_on_hotplug (manager);
 
   g_free (old_test_setup);