brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor-manager: Rename read_current_config to read_current_state

Browse Source 
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
This commit is contained in:
Jonas Ådahl 2016-12-19 15:46:31 +08:00
parent b59a8b1de3
commit c041851fa5
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-monitor-manager-private.h
View File

@ -388,7 +388,7 @@ void meta_crtc_info_free (MetaCrtcInfo *info);
void meta_output_info_free (MetaOutputInfo *info); void meta_output_info_free (MetaOutputInfo *info);
gboolean meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager); 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); void meta_monitor_manager_on_hotplug (MetaMonitorManager *manager);
gboolean meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager, gboolean meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,

6
src/backends/meta-monitor-manager.c
View File

@ -219,7 +219,7 @@ meta_monitor_manager_constructed (GObject *object)
manager->legacy_config = meta_monitor_config_new (); 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); legacy_ensure_configured (manager);
@ -231,7 +231,7 @@ meta_monitor_manager_constructed (GObject *object)
so this is not needed. so this is not needed.
*/ */
if (META_IS_MONITOR_MANAGER_XRANDR (manager)) 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); make_logical_config (manager);
initialize_dbus_interface (manager); initialize_dbus_interface (manager);
@ -1466,7 +1466,7 @@ meta_monitor_manager_tiled_monitor_removed (MetaMonitorManager *manager,
} }
void void
meta_monitor_manager_read_current_config (MetaMonitorManager *manager) meta_monitor_manager_read_current_state (MetaMonitorManager *manager)
{ {
MetaOutput *old_outputs; MetaOutput *old_outputs;
MetaCrtc *old_crtcs; MetaCrtc *old_crtcs;

2
src/backends/native/meta-monitor-manager-kms.c
View File

@ -1472,7 +1472,7 @@ on_uevent (GUdevClient *client,
if (!g_udev_device_get_property_as_boolean (device, "HOTPLUG")) if (!g_udev_device_get_property_as_boolean (device, "HOTPLUG"))
return; return;
meta_monitor_manager_read_current_config (manager); meta_monitor_manager_read_current_state (manager);
meta_monitor_manager_on_hotplug (manager); meta_monitor_manager_on_hotplug (manager);
} }

2
src/backends/x11/meta-monitor-manager-xrandr.c
View File

@ -1597,7 +1597,7 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
XRRUpdateConfiguration (event); 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; hotplug = manager_xrandr->resources->timestamp < manager_xrandr->resources->configTimestamp;
if (hotplug) if (hotplug)

2
src/tests/meta-monitor-manager-test.c
View File

@ -51,7 +51,7 @@ meta_monitor_manager_test_emulate_hotplug (MetaMonitorManagerTest *manager_test,
old_test_setup = manager_test->test_setup; old_test_setup = manager_test->test_setup;
manager_test->test_setup = 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); meta_monitor_manager_on_hotplug (manager);
g_free (old_test_setup); g_free (old_test_setup);