diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2021-04-19 16:13:47 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2021-07-15 11:34:37 +0200 |
| commit | ff0afb186a2741691deca02652a4c2f193246e50 (patch) | |
| tree | a36e2dd4deb6a09b52112508dc109e7c11fa59e3 /src/backends/meta-monitor-manager.c | |
| parent | 50ed027b6f63e6a1b7cc2850c5e68fec1ee4c890 (diff) | |
| download | mutter-ff0afb186a2741691deca02652a4c2f193246e50.tar.gz | |
context: Move 'replace-current-wm' tracking to the context
This move yet another scattered global static variable into the
context's control.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>
Diffstat (limited to 'src/backends/meta-monitor-manager.c')
| -rw-r--r-- | src/backends/meta-monitor-manager.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index 6fa4abed9..e6d50bd99 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -2623,16 +2623,20 @@ on_name_lost (GDBusConnection *connection, static void initialize_dbus_interface (MetaMonitorManager *manager) { - manager->dbus_name_id = g_bus_own_name (G_BUS_TYPE_SESSION, - "org.gnome.Mutter.DisplayConfig", - G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | - (meta_get_replace_current_wm () ? - G_BUS_NAME_OWNER_FLAGS_REPLACE : 0), - on_bus_acquired, - on_name_acquired, - on_name_lost, - g_object_ref (manager), - g_object_unref); + MetaContext *context = meta_backend_get_context (manager->backend); + + manager->dbus_name_id = + g_bus_own_name (G_BUS_TYPE_SESSION, + "org.gnome.Mutter.DisplayConfig", + G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | + (meta_context_is_replacing (context) ? + G_BUS_NAME_OWNER_FLAGS_REPLACE : + G_BUS_NAME_OWNER_FLAGS_NONE), + on_bus_acquired, + on_name_acquired, + on_name_lost, + g_object_ref (manager), + g_object_unref); } /** |