diff options
| author | Ted Gould <ted@canonical.com> | 2009-08-08 14:37:45 -0600 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-08-08 14:37:45 -0600 |
| commit | ab6b46eca06d506b182dd774efa8d79f172f1e46 (patch) | |
| tree | f42d3b4c8cfe3efa637691873e743b4bfbfa7ea4 | |
| parent | 675cfc77c958a5e428a19f00f399d7ea22c53e44 (diff) | |
| parent | 98aa89267118f82a759acd3a2c873b39b940899c (diff) | |
| download | ayatana-indicator-session-ab6b46eca06d506b182dd774efa8d79f172f1e46.tar.gz ayatana-indicator-session-ab6b46eca06d506b182dd774efa8d79f172f1e46.tar.bz2 ayatana-indicator-session-ab6b46eca06d506b182dd774efa8d79f172f1e46.zip | |
* Clean up build a little bit
* Change internal DBus names
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -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 |
5 files changed, 18 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 82c8e6c..f56d5a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sus (0.1~ppa7~status4) UNRELEASED; urgency=low + + * Clean up build a little bit + * Change internal DBus names + + -- Ted Gould <ted@ubuntu.com> Sat, 08 Aug 2009 14:37:20 -0600 + indicator-sus (0.1~ppa7~status3) karmic; urgency=low * Setting the icon from the status service. diff --git a/src/Makefile.am b/src/Makefile.am index 39d360c..bc3c9d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,14 +32,14 @@ indicator_status_service_SOURCES = \ indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) -Wall -Werror indicator_status_service_LDADD = $(STATUSSERVICE_LIBS) -status-service-client.h: status-service.xml +status-service-client.h: $(srcdir)/status-service.xml dbus-binding-tool \ --prefix=_status_service_client \ --mode=glib-client \ --output=status-service-client.h \ $(srcdir)/status-service.xml -status-service-server.h: status-service.xml +status-service-server.h: $(srcdir)/status-service.xml dbus-binding-tool \ --prefix=_status_service_server \ --mode=glib-server \ @@ -72,3 +72,6 @@ BUILT_SOURCES = \ EXTRA_DIST = \ status-service.xml + +CLEANFILES = \ + $(BUILT_SOURCES) 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); |