launcher: Move from backends/native/ to backends/

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4130>

src/backends/meta-backend-types.h

@@ -95,3 +95,5 @@ typedef struct _MetaInputCaptureSession MetaInputCaptureSession;
 
 typedef struct _MetaEis MetaEis;
 typedef struct _MetaEisClient MetaEisClient;
+
+typedef struct _MetaLauncher MetaLauncher;

src/backends/meta-launcher.c

@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include "backends/native/meta-launcher.h"
+#include "backends/meta-launcher.h"
 
 #include <gio/gunixfdlist.h>
 #include <sys/types.h>

src/backends/native/meta-backend-native.c

@@ -52,7 +52,6 @@
 #include "backends/native/meta-device-pool-private.h"
 #include "backends/native/meta-kms.h"
 #include "backends/native/meta-kms-device.h"
-#include "backends/native/meta-launcher.h"
 #include "backends/native/meta-monitor-manager-native.h"
 #include "backends/native/meta-render-device-gbm.h"
 #include "backends/native/meta-renderer-native.h"

src/backends/native/meta-backend-native.h

@@ -23,9 +23,9 @@
 #pragma once
 
 #include "backends/meta-backend-private.h"
+#include "backends/meta-launcher.h"
 #include "backends/native/meta-clutter-backend-native.h"
 #include "backends/native/meta-kms-types.h"
-#include "backends/native/meta-launcher.h"
 #include "backends/native/meta-udev.h"
 
 #define META_BACKEND_TEST_INPUT_SEAT "meta-test-seat0"

src/backends/native/meta-device-pool-private.h

@@ -21,7 +21,6 @@
 
 #include "backends/native/meta-backend-native-types.h"
 #include "backends/native/meta-device-pool.h"
-#include "backends/native/meta-launcher.h"
 
 #define META_TYPE_DEVICE_POOL (meta_device_pool_get_type ())
 G_DECLARE_FINAL_TYPE (MetaDevicePool, meta_device_pool,

src/backends/native/meta-device-pool.c

@@ -25,8 +25,8 @@
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 
+#include "backends/meta-launcher.h"
 #include "backends/native/meta-backend-native.h"
-#include "backends/native/meta-launcher.h"
 #include "meta/meta-backend.h"
 #include "meta/util.h"
 

src/backends/native/meta-gpu-kms.c

@@ -43,7 +43,6 @@
 #include "backends/native/meta-kms-update.h"
 #include "backends/native/meta-kms-utils.h"
 #include "backends/native/meta-kms.h"
-#include "backends/native/meta-launcher.h"
 #include "backends/native/meta-output-kms.h"
 
 struct _MetaGpuKms

src/backends/native/meta-monitor-manager-native.c

@@ -51,7 +51,6 @@
 #include "backends/native/meta-gpu-kms.h"
 #include "backends/native/meta-kms-device.h"
 #include "backends/native/meta-kms.h"
-#include "backends/native/meta-launcher.h"
 #include "backends/native/meta-output-kms.h"
 #include "backends/native/meta-renderer-native.h"
 #include "backends/native/meta-virtual-monitor-native.h"

src/backends/native/meta-udev.c

@@ -20,8 +20,8 @@
 
 #include "backends/native/meta-udev.h"
 
+#include "backends/meta-launcher.h"
 #include "backends/native/meta-backend-native.h"
-#include "backends/native/meta-launcher.h"
 
 #define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor"
 

src/meson.build

@@ -242,6 +242,8 @@ mutter_sources = [
   'backends/meta-input-settings-dummy.h',
   'backends/meta-keymap-utils.c',
   'backends/meta-keymap-utils.h',
+  'backends/meta-launcher.c',
+  'backends/meta-launcher.h',
   'backends/meta-logical-monitor.c',
   'backends/meta-logical-monitor.h',
   'backends/meta-monitor.c',
@@ -802,8 +804,6 @@ if have_native_backend
     'backends/native/meta-input-settings-native.h',
     'backends/native/meta-keymap-native.c',
     'backends/native/meta-keymap-native.h',
-    'backends/native/meta-launcher.c',
-    'backends/native/meta-launcher.h',
     'backends/native/meta-monitor-manager-native.c',
     'backends/native/meta-monitor-manager-native.h',
     'backends/native/meta-output-kms.c',
@@ -984,6 +984,11 @@ dbus_interfaces = [
     'interface': 'org.gnome.Mutter.X11.xml',
     'prefix': 'org.gnome.Mutter',
   },
+  {
+    'name': 'meta-dbus-login1',
+    'interface': 'org.freedesktop.login1.xml',
+    'prefix': 'org.freedesktop.',
+  },
 ]
 
 if have_profiler
@@ -1011,14 +1016,6 @@ if have_native_backend
     command: [gen_default_modes, '@OUTPUT@']
   )
   mutter_built_sources += default_modes_h
-
-  dbus_interfaces += [
-    {
-      'name': 'meta-dbus-login1',
-      'interface': 'org.freedesktop.login1.xml',
-      'prefix': 'org.freedesktop.',
-    },
-  ]
 endif
 
 if have_remote_desktop