diff --git a/src/backends/meta-color-manager.c b/src/backends/meta-color-manager.c index b460c7238..6bc2ba292 100644 --- a/src/backends/meta-color-manager.c +++ b/src/backends/meta-color-manager.c @@ -90,8 +90,8 @@ typedef struct _MetaColorManagerPrivate GHashTable *devices; - MetaDbusSettingsDaemonColor *gsd_color; - MetaDbusSettingsDaemonPowerScreen *gsd_power_screen; + MetaDBusSettingsDaemonColor *gsd_color; + MetaDBusSettingsDaemonPowerScreen *gsd_power_screen; gboolean is_ready; @@ -306,7 +306,7 @@ update_all_gamma (MetaColorManager *color_manager) } static void -on_temperature_changed (MetaDbusSettingsDaemonColor *gsd_color, +on_temperature_changed (MetaDBusSettingsDaemonColor *gsd_color, GParamSpec *pspec, MetaColorManager *color_manager) { @@ -337,7 +337,7 @@ on_gsd_color_ready (GObject *source_object, MetaColorManager *color_manager = META_COLOR_MANAGER (user_data); MetaColorManagerPrivate *priv = meta_color_manager_get_instance_private (color_manager); - MetaDbusSettingsDaemonColor *gsd_color; + MetaDBusSettingsDaemonColor *gsd_color; g_autoptr (GError) error = NULL; gsd_color = @@ -370,7 +370,7 @@ on_gsd_power_screen_ready (GObject *source_object, MetaColorManager *color_manager = META_COLOR_MANAGER (user_data); MetaColorManagerPrivate *priv = meta_color_manager_get_instance_private (color_manager); - MetaDbusSettingsDaemonPowerScreen *gsd_power_screen; + MetaDBusSettingsDaemonPowerScreen *gsd_power_screen; g_autoptr (GError) error = NULL; gsd_power_screen = diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 8ce7d7553..2afffbbf4 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -222,7 +222,7 @@ meta_backend_native_post_init (MetaBackend *backend) if (meta_settings_is_experimental_feature_enabled (settings, META_EXPERIMENTAL_FEATURE_RT_SCHEDULER)) { - g_autoptr (MetaDbusRealtimeKit1) rtkit_proxy = NULL; + g_autoptr (MetaDBusRealtimeKit1) rtkit_proxy = NULL; g_autoptr (GError) error = NULL; rtkit_proxy = diff --git a/src/backends/native/meta-device-pool.c b/src/backends/native/meta-device-pool.c index f5968103d..f783efc2a 100644 --- a/src/backends/native/meta-device-pool.c +++ b/src/backends/native/meta-device-pool.c @@ -54,7 +54,7 @@ struct _MetaDevicePool MetaBackend *backend; - MetaDbusLogin1Session *session_proxy; + MetaDBusLogin1Session *session_proxy; GMutex mutex; @@ -178,7 +178,7 @@ find_device_file_from_path (MetaDevicePool *pool, } static gboolean -take_device (MetaDbusLogin1Session *session_proxy, +take_device (MetaDBusLogin1Session *session_proxy, int dev_major, int dev_minor, int *out_fd, @@ -324,7 +324,7 @@ release_device_file (MetaDevicePool *pool, if (file->flags & META_DEVICE_FILE_FLAG_TAKE_CONTROL) { - MetaDbusLogin1Session *session_proxy; + MetaDBusLogin1Session *session_proxy; meta_topic (META_DEBUG_BACKEND, "Releasing control of and closing device file '%s'", diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c index da202ed31..76851904e 100644 --- a/src/backends/native/meta-launcher.c +++ b/src/backends/native/meta-launcher.c @@ -48,8 +48,8 @@ struct _MetaLauncher { MetaBackend *backend; - MetaDbusLogin1Session *session_proxy; - MetaDbusLogin1Seat *seat_proxy; + MetaDBusLogin1Session *session_proxy; + MetaDBusLogin1Seat *seat_proxy; char *seat_id; gboolean session_active; @@ -241,7 +241,7 @@ find_systemd_session (gchar **session_id, return TRUE; } -static MetaDbusLogin1Session * +static MetaDBusLogin1Session * get_session_proxy (const char *fallback_session_id, GCancellable *cancellable, GError **error) @@ -250,7 +250,7 @@ get_session_proxy (const char *fallback_session_id, g_autofree char *session_id = NULL; g_autoptr (GError) local_error = NULL; GDBusProxyFlags flags; - MetaDbusLogin1Session *session_proxy; + MetaDBusLogin1Session *session_proxy; if (!find_systemd_session (&session_id, &local_error)) { @@ -286,14 +286,14 @@ get_session_proxy (const char *fallback_session_id, return session_proxy; } -static MetaDbusLogin1Seat * +static MetaDBusLogin1Seat * get_seat_proxy (gchar *seat_id, GCancellable *cancellable, GError **error) { g_autofree char *seat_proxy_path = get_escaped_dbus_path ("/org/freedesktop/login1/seat", seat_id); GDBusProxyFlags flags; - MetaDbusLogin1Seat *seat; + MetaDBusLogin1Seat *seat; flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; seat = @@ -313,7 +313,7 @@ sync_active (MetaLauncher *self) { MetaBackend *backend = self->backend; MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend); - MetaDbusLogin1Session *session_proxy = self->session_proxy; + MetaDBusLogin1Session *session_proxy = self->session_proxy; gboolean active; active = meta_dbus_login1_session_get_active (session_proxy); @@ -329,7 +329,7 @@ sync_active (MetaLauncher *self) } static void -on_active_changed (MetaDbusLogin1Session *session, +on_active_changed (MetaDBusLogin1Session *session, GParamSpec *pspec, gpointer user_data) { @@ -366,7 +366,7 @@ get_seat_id (GError **error) return seat_id; } -MetaDbusLogin1Session * +MetaDBusLogin1Session * meta_launcher_get_session_proxy (MetaLauncher *launcher) { return launcher->session_proxy; @@ -379,8 +379,8 @@ meta_launcher_new (MetaBackend *backend, GError **error) { MetaLauncher *self = NULL; - g_autoptr (MetaDbusLogin1Session) session_proxy = NULL; - g_autoptr (MetaDbusLogin1Seat) seat_proxy = NULL; + g_autoptr (MetaDBusLogin1Session) session_proxy = NULL; + g_autoptr (MetaDBusLogin1Seat) seat_proxy = NULL; g_autoptr (GError) local_error = NULL; g_autofree char *seat_id = NULL; gboolean have_control = FALSE; diff --git a/src/backends/native/meta-launcher.h b/src/backends/native/meta-launcher.h index 87363b789..c6bdca0c8 100644 --- a/src/backends/native/meta-launcher.h +++ b/src/backends/native/meta-launcher.h @@ -25,7 +25,7 @@ #include "backends/meta-backend-types.h" typedef struct _MetaLauncher MetaLauncher; -typedef struct _MetaDbusLogin1Session MetaDbusLogin1Session; +typedef struct _MetaDBusLogin1Session MetaDBusLogin1Session; MetaLauncher *meta_launcher_new (MetaBackend *backend, const char *session_id, @@ -39,7 +39,7 @@ gboolean meta_launcher_activate_vt (MetaLauncher *self, const char * meta_launcher_get_seat_id (MetaLauncher *launcher); -MetaDbusLogin1Session * meta_launcher_get_session_proxy (MetaLauncher *launcher); +MetaDBusLogin1Session * meta_launcher_get_session_proxy (MetaLauncher *launcher); MetaBackend * meta_launcher_get_backend (MetaLauncher *launcher); diff --git a/src/meson.build b/src/meson.build index 7063687a7..04b47fe53 100644 --- a/src/meson.build +++ b/src/meson.build @@ -906,8 +906,8 @@ if have_native_backend dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1', join_paths(dbus_interfaces_dir, 'org.freedesktop.login1.xml'), - interface_prefix: 'org.freedesktop.login1.', - namespace: 'MetaDbusLogin1', + interface_prefix: 'org.freedesktop.', + namespace: 'MetaDBus', ) mutter_built_sources += dbus_login1_built_sources endif @@ -931,21 +931,21 @@ endif dbus_rtkit_built_sources = gnome.gdbus_codegen('meta-dbus-rtkit1', join_paths(dbus_interfaces_dir, 'org.freedesktop.RealtimeKit1.xml'), interface_prefix: 'org.freedesktop.', - namespace: 'MetaDbus', + namespace: 'MetaDBus', ) mutter_built_sources += dbus_rtkit_built_sources dbus_gsd_color_built_sources = gnome.gdbus_codegen('meta-dbus-gsd-color', join_paths(dbus_interfaces_dir, 'org.gnome.SettingsDaemon.Color.xml'), interface_prefix: 'org.gnome.', - namespace: 'MetaDbus', + namespace: 'MetaDBus', ) mutter_built_sources += dbus_gsd_color_built_sources dbus_gsd_power_screen_built_sources = gnome.gdbus_codegen('meta-dbus-gsd-power-screen', join_paths(dbus_interfaces_dir, 'org.gnome.SettingsDaemon.Power.Screen.xml'), interface_prefix: 'org.gnome.', - namespace: 'MetaDbus', + namespace: 'MetaDBus', ) mutter_built_sources += dbus_gsd_power_screen_built_sources