diff options
| author | Michael Terry <mike@mterry.name> | 2011-01-13 20:33:50 -0600 |
|---|---|---|
| committer | Michael Terry <mike@mterry.name> | 2011-01-13 20:33:50 -0600 |
| commit | fe8048c25ac7a27099156fb3bdf85604e51ed490 (patch) | |
| tree | 3d107eeaaeb22346de0b9714c5b21315bd4a7d3c | |
| parent | a3311f4e3ca87ca179c99a404fcd43174396e72e (diff) | |
| parent | 7f2ea1fabd276937e263bd6fc1131572252012d3 (diff) | |
| download | ayatana-indicator-application-fe8048c25ac7a27099156fb3bdf85604e51ed490.tar.gz ayatana-indicator-application-fe8048c25ac7a27099156fb3bdf85604e51ed490.tar.bz2 ayatana-indicator-application-fe8048c25ac7a27099156fb3bdf85604e51ed490.zip | |
merge ken's com.canonical branch
| -rw-r--r-- | data/indicator-application.service.in | 2 | ||||
| -rw-r--r-- | src/application-service.xml | 2 | ||||
| -rw-r--r-- | src/dbus-shared.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/data/indicator-application.service.in b/data/indicator-application.service.in index 83e430a..f6ceee3 100644 --- a/data/indicator-application.service.in +++ b/data/indicator-application.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.ayatana.indicator.application +Name=com.canonical.indicator.application Exec=@libexecdir@/indicator-application-service diff --git a/src/application-service.xml b/src/application-service.xml index 031bf68..ae20900 100644 --- a/src/application-service.xml +++ b/src/application-service.xml @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. --> <node name="/"> - <interface name="org.ayatana.indicator.application.service"> + <interface name="com.canonical.indicator.application.service"> <!-- Properties --> <!-- None currently --> diff --git a/src/dbus-shared.h b/src/dbus-shared.h index 1d8d89c..71c063e 100644 --- a/src/dbus-shared.h +++ b/src/dbus-shared.h @@ -20,9 +20,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define INDICATOR_APPLICATION_DBUS_ADDR "org.ayatana.indicator.application" -#define INDICATOR_APPLICATION_DBUS_OBJ "/org/ayatana/indicator/application/service" -#define INDICATOR_APPLICATION_DBUS_IFACE "org.ayatana.indicator.application.service" +#define INDICATOR_APPLICATION_DBUS_ADDR "com.canonical.indicator.application" +#define INDICATOR_APPLICATION_DBUS_OBJ "/com/canonical/indicator/application/service" +#define INDICATOR_APPLICATION_DBUS_IFACE "com.canonical.indicator.application.service" #define NOTIFICATION_WATCHER_DBUS_ADDR "org.kde.StatusNotifierWatcher" #define NOTIFICATION_WATCHER_DBUS_OBJ "/StatusNotifierWatcher" |