diff options
| author | Ted Gould <ted@canonical.com> | 2009-08-08 14:37:04 -0600 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-08-08 14:37:04 -0600 |
| commit | 98aa89267118f82a759acd3a2c873b39b940899c (patch) | |
| tree | 41c57f6feed05ff6738e0b9fe9749dadaa98a581 /src | |
| parent | e00549509eb130648473d1f6536d67b7ffac756a (diff) | |
| download | ayatana-indicator-session-98aa89267118f82a759acd3a2c873b39b940899c.tar.gz ayatana-indicator-session-98aa89267118f82a759acd3a2c873b39b940899c.tar.bz2 ayatana-indicator-session-98aa89267118f82a759acd3a2c873b39b940899c.zip | |
Shuffling around the DBus names so that everything is happier.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus-shared-names.h | 7 | ||||
| -rw-r--r-- | src/indicator-sus.c | 2 | ||||
| -rw-r--r-- | src/status-service-dbus.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 6eb261f..a645830 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -25,13 +25,14 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define __DBUS_SHARED_NAMES_H__ 1 #define INDICATOR_STATUS_DBUS_NAME "org.ayatana.indicator.status" -#define INDICATOR_STATUS_DBUS_OBJECT "/org/ayatana/indicator/status" +#define INDICATOR_STATUS_DBUS_OBJECT "/org/ayatana/indicator/status/menu" +#define INDICATOR_STATUS_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/status/service" #define INDICATOR_STATUS_SERVICE_DBUS_INTERFACE "org.ayatana.indicator.status.service" #define INDICATOR_USERS_DBUS_NAME "org.ayatana.indicator.users" -#define INDICATOR_USERS_DBUS_OBJECT "/org/ayatana/indicator/users" +#define INDICATOR_USERS_DBUS_OBJECT "/org/ayatana/indicator/users/menu" #define INDICATOR_SESSION_DBUS_NAME "org.ayatana.indicator.session" -#define INDICATOR_SESSION_DBUS_OBJECT "/org/ayatana/indicator/session" +#define INDICATOR_SESSION_DBUS_OBJECT "/org/ayatana/indicator/session/menu" #endif /* __DBUS_SHARED_NAMES_H__ */ diff --git a/src/indicator-sus.c b/src/indicator-sus.c index 5788d42..be83c29 100644 --- a/src/indicator-sus.c +++ b/src/indicator-sus.c @@ -210,7 +210,7 @@ connect_to_status (gpointer userdata) status_proxy = dbus_g_proxy_new_for_name_owner(sbus, INDICATOR_STATUS_DBUS_NAME, - INDICATOR_STATUS_DBUS_OBJECT, + INDICATOR_STATUS_SERVICE_DBUS_OBJECT, INDICATOR_STATUS_SERVICE_DBUS_INTERFACE, &error); diff --git a/src/status-service-dbus.c b/src/status-service-dbus.c index f93980f..09d2711 100644 --- a/src/status-service-dbus.c +++ b/src/status-service-dbus.c @@ -116,7 +116,7 @@ status_service_dbus_init (StatusServiceDbus *self) DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); dbus_g_connection_register_g_object(connection, - INDICATOR_STATUS_DBUS_OBJECT, + INDICATOR_STATUS_SERVICE_DBUS_OBJECT, G_OBJECT(self)); StatusServiceDbusPrivate * priv = STATUS_SERVICE_DBUS_GET_PRIVATE(self); |