aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-01-13 21:07:18 -0600
committerKen VanDine <ken.vandine@canonical.com>2011-01-13 21:07:18 -0600
commit60da9798f6dcdd85934e177a989ffe447580ec8e (patch)
tree677c3c9e0d00de995eef2bac148fbf6d4aef9f0a
parentde3f20423d68bbe6ebfb349b3b3777bd479ba7bb (diff)
downloadayatana-indicator-session-60da9798f6dcdd85934e177a989ffe447580ec8e.tar.gz
ayatana-indicator-session-60da9798f6dcdd85934e177a989ffe447580ec8e.tar.bz2
ayatana-indicator-session-60da9798f6dcdd85934e177a989ffe447580ec8e.zip
dbus interface rename, com.canonical
-rw-r--r--data/indicator-session.service.in2
-rw-r--r--data/indicator-users.service.in2
-rw-r--r--src/dbus-shared-names.h20
-rw-r--r--src/session-dbus.xml4
4 files changed, 14 insertions, 14 deletions
diff --git a/data/indicator-session.service.in b/data/indicator-session.service.in
index 50d8635..a4d10a1 100644
--- a/data/indicator-session.service.in
+++ b/data/indicator-session.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.ayatana.indicator.session
+Name=com.canonical.indicator.session
Exec=@libexecdir@/indicator-session-service
diff --git a/data/indicator-users.service.in b/data/indicator-users.service.in
index 2dc9062..8bb6819 100644
--- a/data/indicator-users.service.in
+++ b/data/indicator-users.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.ayatana.indicator.users
+Name=com.canonical.indicator.users
Exec=@libexecdir@/indicator-users-service
diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h
index 3ac14b3..f97dddc 100644
--- a/src/dbus-shared-names.h
+++ b/src/dbus-shared-names.h
@@ -24,22 +24,22 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef __DBUS_SHARED_NAMES_H__
#define __DBUS_SHARED_NAMES_H__ 1
-#define INDICATOR_STATUS_DBUS_NAME "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_STATUS_DBUS_NAME "com.canonical.indicator.status"
+#define INDICATOR_STATUS_DBUS_OBJECT "/com/canonical/indicator/status/menu"
+#define INDICATOR_STATUS_SERVICE_DBUS_OBJECT "/com/canonical/indicator/status/service"
+#define INDICATOR_STATUS_SERVICE_DBUS_INTERFACE "com.canonical.indicator.status.service"
-#define INDICATOR_USERS_DBUS_NAME "org.ayatana.indicator.users"
-#define INDICATOR_USERS_DBUS_OBJECT "/org/ayatana/indicator/users/menu"
+#define INDICATOR_USERS_DBUS_NAME "com.canonical.indicator.users"
+#define INDICATOR_USERS_DBUS_OBJECT "/com/canonical/indicator/users/menu"
#define INDICATOR_USERS_SERVICE_DBUS_OBJECT "/org/gnome/DisplayManager/UserManager"
#define INDICATOR_USERS_SERVICE_DBUS_INTERFACE "org.gnome.DisplayManager.UserManager"
-#define INDICATOR_SESSION_DBUS_NAME "org.ayatana.indicator.session"
-#define INDICATOR_SESSION_DBUS_OBJECT "/org/ayatana/indicator/session/menu"
+#define INDICATOR_SESSION_DBUS_NAME "com.canonical.indicator.session"
+#define INDICATOR_SESSION_DBUS_OBJECT "/com/canonical/indicator/session/menu"
#define INDICATOR_SESSION_DBUS_VERSION 0
-#define INDICATOR_SESSION_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/session/service"
-#define INDICATOR_SESSION_SERVICE_DBUS_IFACE "org.ayatana.indicator.session.service"
+#define INDICATOR_SESSION_SERVICE_DBUS_OBJECT "/com/canonical/indicator/session/service"
+#define INDICATOR_SESSION_SERVICE_DBUS_IFACE "com.canonical.indicator.session.service"
#define USER_ITEM_TYPE "x-canonical-user-item"
#define USER_ITEM_PROP_NAME "user-item-name"
diff --git a/src/session-dbus.xml b/src/session-dbus.xml
index 3ce1693..ee724f5 100644
--- a/src/session-dbus.xml
+++ b/src/session-dbus.xml
@@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/ayatana/indicator/session/service">
- <interface name="org.ayatana.indicator.session.service">
+<node name="/com/canonical/indicator/session/service">
+ <interface name="com.canonical.indicator.session.service">
<!-- Icon -->
<method name="GetIcon">