From e3ea5e55a8541e82f898336a9a52db059021d6df Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Fri, 12 May 2017 12:01:13 +0100 Subject: [PATCH] Fix incorrect DBUS names These names changed since the move to multi-process CSD plugins. --- plugins/color/csd-color-manager.c | 2 +- plugins/media-keys/csd-media-keys-manager.c | 6 +++--- plugins/orientation/csd-orientation-manager.c | 10 +++------- plugins/power/csd-power-manager.c | 11 +++++------ 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/plugins/color/csd-color-manager.c b/plugins/color/csd-color-manager.c index 063ee86..2c8638a 100644 --- a/plugins/color/csd-color-manager.c +++ b/plugins/color/csd-color-manager.c @@ -1036,7 +1036,7 @@ gcm_session_use_output_profile_for_screen (CsdColorManager *manager, #define CD_PROFILE_METADATA_SCREEN_BRIGHTNESS "SCREEN_brightness" #endif -#define CSD_DBUS_SERVICE "org.cinnamon.SettingsDaemon" +#define CSD_DBUS_SERVICE "org.cinnamon.SettingsDaemon.Power" #define CSD_DBUS_INTERFACE_POWER_SCREEN "org.cinnamon.SettingsDaemon.Power.Screen" #define CSD_DBUS_PATH_POWER "/org/cinnamon/SettingsDaemon/Power" diff --git a/plugins/media-keys/csd-media-keys-manager.c b/plugins/media-keys/csd-media-keys-manager.c index 88cd7ed..39dae7d 100644 --- a/plugins/media-keys/csd-media-keys-manager.c +++ b/plugins/media-keys/csd-media-keys-manager.c @@ -2312,7 +2312,7 @@ on_bus_gotten (GObject *source_object, g_dbus_proxy_new (manager->priv->connection, G_DBUS_PROXY_FLAGS_NONE, NULL, - "org.cinnamon.SettingsDaemon", + "org.cinnamon.SettingsDaemon.XRANDR_2", "/org/cinnamon/SettingsDaemon/XRANDR", "org.cinnamon.SettingsDaemon.XRANDR_2", NULL, @@ -2322,7 +2322,7 @@ on_bus_gotten (GObject *source_object, g_dbus_proxy_new (manager->priv->connection, G_DBUS_PROXY_FLAGS_NONE, NULL, - "org.cinnamon.SettingsDaemon", + "org.cinnamon.SettingsDaemon.Power", "/org/cinnamon/SettingsDaemon/Power", "org.cinnamon.SettingsDaemon.Power.Screen", NULL, @@ -2332,7 +2332,7 @@ on_bus_gotten (GObject *source_object, g_dbus_proxy_new (manager->priv->connection, G_DBUS_PROXY_FLAGS_NONE, NULL, - "org.cinnamon.SettingsDaemon", + "org.cinnamon.SettingsDaemon.Power", "/org/cinnamon/SettingsDaemon/Power", "org.cinnamon.SettingsDaemon.Power.Keyboard", NULL, diff --git a/plugins/orientation/csd-orientation-manager.c b/plugins/orientation/csd-orientation-manager.c index 9e09778..dcf5671 100644 --- a/plugins/orientation/csd-orientation-manager.c +++ b/plugins/orientation/csd-orientation-manager.c @@ -66,10 +66,6 @@ struct CsdOrientationManagerPrivate #define CONF_SCHEMA "org.cinnamon.settings-daemon.peripherals.touchscreen" #define ORIENTATION_LOCK_KEY "orientation-lock" -#define CSD_DBUS_NAME "org.cinnamon.SettingsDaemon" -#define CSD_DBUS_PATH "/org/cinnamon/SettingsDaemon" -#define CSD_DBUS_BASE_INTERFACE "org.cinnamon.SettingsDaemon" - static void csd_orientation_manager_finalize (GObject *object); G_DEFINE_TYPE (CsdOrientationManager, csd_orientation_manager, G_TYPE_OBJECT) @@ -442,9 +438,9 @@ csd_orientation_manager_start (CsdOrientationManager *manager, g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, NULL, - CSD_DBUS_NAME, - CSD_DBUS_PATH "/XRANDR", - CSD_DBUS_BASE_INTERFACE ".XRANDR_2", + "org.cinnamon.SettingsDaemon.XRANDR_2", + "/org/cinnamon/SettingsDaemon/XRANDR", + "org.cinnamon.SettingsDaemon.XRANDR_2", NULL, (GAsyncReadyCallback) xrandr_ready_cb, manager); diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c index 1dd29cd..fc4f38a 100644 --- a/plugins/power/csd-power-manager.c +++ b/plugins/power/csd-power-manager.c @@ -64,9 +64,8 @@ #define CSD_XRANDR_SETTINGS_SCHEMA "org.cinnamon.settings-daemon.plugins.xrandr" #define CSD_SESSION_SETTINGS_SCHEMA "org.cinnamon.desktop.session" -#define CSD_DBUS_SERVICE "org.cinnamon.SettingsDaemon" -#define CSD_DBUS_PATH "/org/cinnamon/SettingsDaemon" -#define CSD_POWER_DBUS_PATH CSD_DBUS_PATH "/Power" +#define CSD_POWER_DBUS_SERVICE "org.cinnamon.SettingsDaemon.Power" +#define CSD_POWER_DBUS_PATH "/org/cinnamon/SettingsDaemon/Power" #define CSD_POWER_DBUS_INTERFACE "org.cinnamon.SettingsDaemon.Power" #define CSD_POWER_DBUS_INTERFACE_SCREEN "org.cinnamon.SettingsDaemon.Power.Screen" #define CSD_POWER_DBUS_INTERFACE_KEYBOARD "org.cinnamon.SettingsDaemon.Power.Keyboard" @@ -2054,7 +2053,7 @@ upower_kbd_emit_changed (CsdPowerManager *manager) if (manager->priv->connection == NULL) return; ret = g_dbus_connection_emit_signal (manager->priv->connection, - CSD_DBUS_SERVICE, + CSD_POWER_DBUS_SERVICE, CSD_POWER_DBUS_PATH, CSD_POWER_DBUS_INTERFACE_KEYBOARD, "Changed", @@ -2846,7 +2845,7 @@ backlight_emit_changed (CsdPowerManager *manager) if (manager->priv->connection == NULL) return; ret = g_dbus_connection_emit_signal (manager->priv->connection, - CSD_DBUS_SERVICE, + CSD_POWER_DBUS_SERVICE, CSD_POWER_DBUS_PATH, CSD_POWER_DBUS_INTERFACE_SCREEN, "Changed", @@ -4679,7 +4678,7 @@ device_to_variant_blob (UpDevice *device) /* get an object path, even for the composite device */ object_path = up_device_get_object_path (device); if (object_path == NULL) - object_path = CSD_DBUS_PATH; + object_path = CSD_POWER_DBUS_PATH; /* format complex object */ value = g_variant_new ("(sssusdut)",