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

Use the same prefix for all generated D-Bus boiler plate

Browse Source 
A somewhat painful rename, but it'll open up for simplifying the build
script a bit, while at the same time bringing consistency to chaos.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2811>
This commit is contained in:
Jonas Ådahl 2023-01-27 16:23:14 +01:00
parent 176b706e66
commit 8b92a00dd1
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backends/meta-color-manager.c
View File

@ -90,8 +90,8 @@ typedef struct _MetaColorManagerPrivate
GHashTable *devices; GHashTable *devices;
MetaDbusSettingsDaemonColor *gsd_color; MetaDBusSettingsDaemonColor *gsd_color;
MetaDbusSettingsDaemonPowerScreen *gsd_power_screen; MetaDBusSettingsDaemonPowerScreen *gsd_power_screen;
gboolean is_ready; gboolean is_ready;
@ -306,7 +306,7 @@ update_all_gamma (MetaColorManager *color_manager)
} }
static void static void
on_temperature_changed (MetaDbusSettingsDaemonColor *gsd_color, on_temperature_changed (MetaDBusSettingsDaemonColor *gsd_color,
GParamSpec *pspec, GParamSpec *pspec,
MetaColorManager *color_manager) MetaColorManager *color_manager)
{ {
@ -337,7 +337,7 @@ on_gsd_color_ready (GObject *source_object,
MetaColorManager *color_manager = META_COLOR_MANAGER (user_data); MetaColorManager *color_manager = META_COLOR_MANAGER (user_data);
MetaColorManagerPrivate *priv = MetaColorManagerPrivate *priv =
meta_color_manager_get_instance_private (color_manager); meta_color_manager_get_instance_private (color_manager);
MetaDbusSettingsDaemonColor *gsd_color; MetaDBusSettingsDaemonColor *gsd_color;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
gsd_color = gsd_color =
@ -370,7 +370,7 @@ on_gsd_power_screen_ready (GObject *source_object,
MetaColorManager *color_manager = META_COLOR_MANAGER (user_data); MetaColorManager *color_manager = META_COLOR_MANAGER (user_data);
MetaColorManagerPrivate *priv = MetaColorManagerPrivate *priv =
meta_color_manager_get_instance_private (color_manager); meta_color_manager_get_instance_private (color_manager);
MetaDbusSettingsDaemonPowerScreen *gsd_power_screen; MetaDBusSettingsDaemonPowerScreen *gsd_power_screen;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
gsd_power_screen = gsd_power_screen =

2
src/backends/native/meta-backend-native.c
View File

@ -222,7 +222,7 @@ meta_backend_native_post_init (MetaBackend *backend)
if (meta_settings_is_experimental_feature_enabled (settings, if (meta_settings_is_experimental_feature_enabled (settings,
META_EXPERIMENTAL_FEATURE_RT_SCHEDULER)) META_EXPERIMENTAL_FEATURE_RT_SCHEDULER))
{ {
g_autoptr (MetaDbusRealtimeKit1) rtkit_proxy = NULL; g_autoptr (MetaDBusRealtimeKit1) rtkit_proxy = NULL;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
rtkit_proxy = rtkit_proxy =

6
src/backends/native/meta-device-pool.c
View File

@ -54,7 +54,7 @@ struct _MetaDevicePool
MetaBackend *backend; MetaBackend *backend;
MetaDbusLogin1Session *session_proxy; MetaDBusLogin1Session *session_proxy;
GMutex mutex; GMutex mutex;
@ -178,7 +178,7 @@ find_device_file_from_path (MetaDevicePool *pool,
} }
static gboolean static gboolean
take_device (MetaDbusLogin1Session *session_proxy, take_device (MetaDBusLogin1Session *session_proxy,
int dev_major, int dev_major,
int dev_minor, int dev_minor,
int *out_fd, int *out_fd,
@ -324,7 +324,7 @@ release_device_file (MetaDevicePool *pool,
if (file->flags & META_DEVICE_FILE_FLAG_TAKE_CONTROL) if (file->flags & META_DEVICE_FILE_FLAG_TAKE_CONTROL)
{ {
MetaDbusLogin1Session *session_proxy; MetaDBusLogin1Session *session_proxy;
meta_topic (META_DEBUG_BACKEND, meta_topic (META_DEBUG_BACKEND,
"Releasing control of and closing device file '%s'", "Releasing control of and closing device file '%s'",

22
src/backends/native/meta-launcher.c
View File

@ -48,8 +48,8 @@ struct _MetaLauncher
{ {
MetaBackend *backend; MetaBackend *backend;
MetaDbusLogin1Session *session_proxy; MetaDBusLogin1Session *session_proxy;
MetaDbusLogin1Seat *seat_proxy; MetaDBusLogin1Seat *seat_proxy;
char *seat_id; char *seat_id;
gboolean session_active; gboolean session_active;
@ -241,7 +241,7 @@ find_systemd_session (gchar **session_id,
return TRUE; return TRUE;
} }
static MetaDbusLogin1Session * static MetaDBusLogin1Session *
get_session_proxy (const char *fallback_session_id, get_session_proxy (const char *fallback_session_id,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
@ -250,7 +250,7 @@ get_session_proxy (const char *fallback_session_id,
g_autofree char *session_id = NULL; g_autofree char *session_id = NULL;
g_autoptr (GError) local_error = NULL; g_autoptr (GError) local_error = NULL;
GDBusProxyFlags flags; GDBusProxyFlags flags;
MetaDbusLogin1Session *session_proxy; MetaDBusLogin1Session *session_proxy;
if (!find_systemd_session (&session_id, &local_error)) if (!find_systemd_session (&session_id, &local_error))
{ {
@ -286,14 +286,14 @@ get_session_proxy (const char *fallback_session_id,
return session_proxy; return session_proxy;
} }
static MetaDbusLogin1Seat * static MetaDBusLogin1Seat *
get_seat_proxy (gchar *seat_id, get_seat_proxy (gchar *seat_id,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
g_autofree char *seat_proxy_path = get_escaped_dbus_path ("/org/freedesktop/login1/seat", seat_id); g_autofree char *seat_proxy_path = get_escaped_dbus_path ("/org/freedesktop/login1/seat", seat_id);
GDBusProxyFlags flags; GDBusProxyFlags flags;
MetaDbusLogin1Seat *seat; MetaDBusLogin1Seat *seat;
flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
seat = seat =
@ -313,7 +313,7 @@ sync_active (MetaLauncher *self)
{ {
MetaBackend *backend = self->backend; MetaBackend *backend = self->backend;
MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend); MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend);
MetaDbusLogin1Session *session_proxy = self->session_proxy; MetaDBusLogin1Session *session_proxy = self->session_proxy;
gboolean active; gboolean active;
active = meta_dbus_login1_session_get_active (session_proxy); active = meta_dbus_login1_session_get_active (session_proxy);
@ -329,7 +329,7 @@ sync_active (MetaLauncher *self)
} }
static void static void
on_active_changed (MetaDbusLogin1Session *session, on_active_changed (MetaDBusLogin1Session *session,
GParamSpec *pspec, GParamSpec *pspec,
gpointer user_data) gpointer user_data)
{ {
@ -366,7 +366,7 @@ get_seat_id (GError **error)
return seat_id; return seat_id;
} }
MetaDbusLogin1Session * MetaDBusLogin1Session *
meta_launcher_get_session_proxy (MetaLauncher *launcher) meta_launcher_get_session_proxy (MetaLauncher *launcher)
{ {
return launcher->session_proxy; return launcher->session_proxy;
@ -379,8 +379,8 @@ meta_launcher_new (MetaBackend *backend,
GError **error) GError **error)
{ {
MetaLauncher *self = NULL; MetaLauncher *self = NULL;
g_autoptr (MetaDbusLogin1Session) session_proxy = NULL; g_autoptr (MetaDBusLogin1Session) session_proxy = NULL;
g_autoptr (MetaDbusLogin1Seat) seat_proxy = NULL; g_autoptr (MetaDBusLogin1Seat) seat_proxy = NULL;
g_autoptr (GError) local_error = NULL; g_autoptr (GError) local_error = NULL;
g_autofree char *seat_id = NULL; g_autofree char *seat_id = NULL;
gboolean have_control = FALSE; gboolean have_control = FALSE;

4
src/backends/native/meta-launcher.h
View File

@ -25,7 +25,7 @@
#include "backends/meta-backend-types.h" #include "backends/meta-backend-types.h"
typedef struct _MetaLauncher MetaLauncher; typedef struct _MetaLauncher MetaLauncher;
typedef struct _MetaDbusLogin1Session MetaDbusLogin1Session; typedef struct _MetaDBusLogin1Session MetaDBusLogin1Session;
MetaLauncher *meta_launcher_new (MetaBackend *backend, MetaLauncher *meta_launcher_new (MetaBackend *backend,
const char *session_id, const char *session_id,
@ -39,7 +39,7 @@ gboolean meta_launcher_activate_vt (MetaLauncher *self,
const char * meta_launcher_get_seat_id (MetaLauncher *launcher); 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); MetaBackend * meta_launcher_get_backend (MetaLauncher *launcher);

10
src/meson.build
View File

@ -906,8 +906,8 @@ if have_native_backend
dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1', dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1',
join_paths(dbus_interfaces_dir, 'org.freedesktop.login1.xml'), join_paths(dbus_interfaces_dir, 'org.freedesktop.login1.xml'),
interface_prefix: 'org.freedesktop.login1.', interface_prefix: 'org.freedesktop.',
namespace: 'MetaDbusLogin1', namespace: 'MetaDBus',
) )
mutter_built_sources += dbus_login1_built_sources mutter_built_sources += dbus_login1_built_sources
endif endif
@ -931,21 +931,21 @@ endif
dbus_rtkit_built_sources = gnome.gdbus_codegen('meta-dbus-rtkit1', dbus_rtkit_built_sources = gnome.gdbus_codegen('meta-dbus-rtkit1',
join_paths(dbus_interfaces_dir, 'org.freedesktop.RealtimeKit1.xml'), join_paths(dbus_interfaces_dir, 'org.freedesktop.RealtimeKit1.xml'),
interface_prefix: 'org.freedesktop.', interface_prefix: 'org.freedesktop.',
namespace: 'MetaDbus', namespace: 'MetaDBus',
) )
mutter_built_sources += dbus_rtkit_built_sources mutter_built_sources += dbus_rtkit_built_sources
dbus_gsd_color_built_sources = gnome.gdbus_codegen('meta-dbus-gsd-color', dbus_gsd_color_built_sources = gnome.gdbus_codegen('meta-dbus-gsd-color',
join_paths(dbus_interfaces_dir, 'org.gnome.SettingsDaemon.Color.xml'), join_paths(dbus_interfaces_dir, 'org.gnome.SettingsDaemon.Color.xml'),
interface_prefix: 'org.gnome.', interface_prefix: 'org.gnome.',
namespace: 'MetaDbus', namespace: 'MetaDBus',
) )
mutter_built_sources += dbus_gsd_color_built_sources mutter_built_sources += dbus_gsd_color_built_sources
dbus_gsd_power_screen_built_sources = gnome.gdbus_codegen('meta-dbus-gsd-power-screen', 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'), join_paths(dbus_interfaces_dir, 'org.gnome.SettingsDaemon.Power.Screen.xml'),
interface_prefix: 'org.gnome.', interface_prefix: 'org.gnome.',
namespace: 'MetaDbus', namespace: 'MetaDBus',
) )
mutter_built_sources += dbus_gsd_power_screen_built_sources mutter_built_sources += dbus_gsd_power_screen_built_sources