aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-08-19 16:51:38 +0000
committerTarmac <Unknown>2013-08-19 16:51:38 +0000
commit8adc1d9acb001ea99937d2b8cbccb2fc4adf1ed2 (patch)
tree2d325350e2a5510a9075d207d69dc8b2f25c43d9 /data
parent97d88bc9bc34f0bf654281d32c3e0aab85fa0f4d (diff)
parent41bd58d41cd15a8ca8e4499b2abe945a4fe1667d (diff)
downloadayatana-indicator-messages-8adc1d9acb001ea99937d2b8cbccb2fc4adf1ed2.tar.gz
ayatana-indicator-messages-8adc1d9acb001ea99937d2b8cbccb2fc4adf1ed2.tar.bz2
ayatana-indicator-messages-8adc1d9acb001ea99937d2b8cbccb2fc4adf1ed2.zip
Merge in phablet branch.
Approved by PS Jenkins bot, Pete Woods.
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