aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPete Woods <pete.woods@canonical.com>2013-08-20 11:38:10 +0100
committerPete Woods <pete.woods@canonical.com>2013-08-20 11:38:10 +0100
commit79c89af3ac3c0c04f947c98b360a3ccaccbfc5dc (patch)
treecfc0e002b44a53eba419ad3f80b72201dde58bba /data
parent94fef3bf0ca765544ef93f4a6cd38684b3ccf02e (diff)
downloadayatana-indicator-messages-79c89af3ac3c0c04f947c98b360a3ccaccbfc5dc.tar.gz
ayatana-indicator-messages-79c89af3ac3c0c04f947c98b360a3ccaccbfc5dc.tar.bz2
ayatana-indicator-messages-79c89af3ac3c0c04f947c98b360a3ccaccbfc5dc.zip
Re-do merge
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am5
-rw-r--r--data/com.canonical.indicator.messages10
2 files changed, 14 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 488ce05..45ff12f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = icons
-dbus_servicesdir = $(DBUSSERVICEDIR)
+dbus_servicesdir = $(datadir)/dbus-1/services
dbus_services_DATA = indicator-messages.service
%.service: %.service.in
@@ -9,6 +9,9 @@ dbus_services_DATA = indicator-messages.service
gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml
@GSETTINGS_RULES@
+indicatordir = $(INDICATOR_DIR)
+dist_indicator_DATA = com.canonical.indicator.messages
+
EXTRA_DIST = \
$(gsettings_SCHEMAS) \
indicator-messages.service.in
diff --git a/data/com.canonical.indicator.messages b/data/com.canonical.indicator.messages
new file mode 100644
index 0000000..fa0ac50
--- /dev/null
+++ b/data/com.canonical.indicator.messages
@@ -0,0 +1,10 @@
+[Indicator Service]
+Name=indicator-messages
+ObjectPath=/com/canonical/indicator/messages
+Position=50
+
+[desktop]
+ObjectPath=/com/canonical/indicator/messages/desktop
+
+[phone]
+ObjectPath=/com/canonical/indicator/messages/phone