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

Port screen cast and remote desktop to MetaDbusSessionManager

Browse Source 
This eliminates some code duplication related to managing D-Bus session
objects.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2713>
This commit is contained in:
Jonas Ådahl
2022-03-11 09:39:07 +01:00
committed by Marge Bot
parent 122fea2dc4
commit 5731268087
13 changed files with 501 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/backends/meta-backend.c
View File

@ -206,9 +206,9 @@ meta_backend_dispose (GObject *object)
#ifdef HAVE_REMOTE_DESKTOP
g_clear_object (&priv->remote_desktop);
g_clear_object (&priv->screen_cast);
#endif
g_clear_object (&priv->dbus_session_watcher);
g_clear_object (&priv->remote_access_controller);
#endif
#ifdef HAVE_LIBWACOM
g_clear_pointer (&priv->wacom_db, libwacom_database_destroy);
@ -557,14 +557,20 @@ meta_backend_real_post_init (MetaBackend *backend)
input_settings);
}
#ifdef HAVE_REMOTE_DESKTOP
priv->dbus_session_watcher = g_object_new (META_TYPE_DBUS_SESSION_WATCHER, NULL);
priv->screen_cast = meta_screen_cast_new (backend,
priv->dbus_session_watcher);
priv->remote_desktop = meta_remote_desktop_new (backend,
priv->dbus_session_watcher);
priv->remote_access_controller =
meta_remote_access_controller_new (priv->remote_desktop, priv->screen_cast);
meta_remote_access_controller_new ();
priv->dbus_session_watcher =
g_object_new (META_TYPE_DBUS_SESSION_WATCHER, NULL);
#ifdef HAVE_REMOTE_DESKTOP
priv->screen_cast = meta_screen_cast_new (backend);
meta_remote_access_controller_add (
priv->remote_access_controller,
META_DBUS_SESSION_MANAGER (priv->screen_cast));
priv->remote_desktop = meta_remote_desktop_new (backend);
meta_remote_access_controller_add (
priv->remote_access_controller,
META_DBUS_SESSION_MANAGER (priv->remote_desktop));
#endif /* HAVE_REMOTE_DESKTOP */
if (!meta_monitor_manager_is_headless (priv->monitor_manager))