summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mayo <aklhfex@gmail.com>2023-04-01 18:02:56 +0100
committerMarge Bot <marge-bot@gnome.org>2023-04-03 21:34:54 +0000
commit28a599631de8fbbf28777e5238da1d7addcc0d56 (patch)
treec8344fbf7c3c1d62770726817d16eed830c36256
parent29c14ba0a5f2085b285bc61ea241d8e4bf5c6410 (diff)
downloadmutter-28a599631de8fbbf28777e5238da1d7addcc0d56.tar.gz
backend: Fix build with -Dremote_desktop=false
../mutter-44.0/src/backends/meta-backend.c: In function ‘meta_backend_real_post_init’: ../mutter-44.0/src/backends/meta-backend.c:560:7: error: ‘MetaBackendPrivate’ {aka ‘struct _MetaBackendPrivate’} has no member named ‘remote_access_controller’ 560 | priv->remote_access_controller = | ^~ Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2655 Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2935>
-rw-r--r--src/backends/meta-backend.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index d278e6a85..e77b9612b 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -63,6 +63,7 @@
#include "backends/meta-input-settings-private.h"
#include "backends/meta-logical-monitor.h"
#include "backends/meta-monitor-manager-dummy.h"
+#include "backends/meta-remote-access-controller-private.h"
#include "backends/meta-settings-private.h"
#include "backends/meta-stage-private.h"
#include "backends/x11/meta-backend-x11.h"
@@ -77,7 +78,6 @@
#include "meta/util.h"
#ifdef HAVE_REMOTE_DESKTOP
-#include "backends/meta-remote-access-controller-private.h"
#include "backends/meta-remote-desktop.h"
#include "backends/meta-screen-cast.h"
#endif
@@ -134,8 +134,8 @@ struct _MetaBackendPrivate
#endif
MetaSettings *settings;
MetaDbusSessionWatcher *dbus_session_watcher;
-#ifdef HAVE_REMOTE_DESKTOP
MetaRemoteAccessController *remote_access_controller;
+#ifdef HAVE_REMOTE_DESKTOP
MetaScreenCast *screen_cast;
MetaRemoteDesktop *remote_desktop;
#endif
@@ -1410,13 +1410,9 @@ meta_backend_get_screen_cast (MetaBackend *backend)
MetaRemoteAccessController *
meta_backend_get_remote_access_controller (MetaBackend *backend)
{
-#ifdef HAVE_REMOTE_DESKTOP
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
return priv->remote_access_controller;
-#else
- return NULL;
-#endif
}
/**