Switch over from Ubuntu System Indicator to Ayatana System Indicator.

12 files changed, 52 insertions, 50 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 9dd100b..226ff81 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,12 +5,12 @@ CLEANFILES =
 SUBDIRS = upstart
 
 # the indicator bus file
-indicatorsdir = $(datadir)/unity/indicators
-dist_indicators_DATA = com.canonical.indicator.bluetooth
+indicatorsdir = $(datadir)/ayatana/indicators
+dist_indicators_DATA = org.ayatana.indicator.bluetooth
 
 # the systemd unit file
 systemddir = $(SYSTEMD_USERDIR)
-systemd_DATA = indicator-bluetooth.service
+systemd_DATA = ayatana-indicator-bluetooth.service
 systemd_in = $(systemd_DATA:.service=.service.in)
 $(systemd_DATA): $(systemd_in)
 	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
@@ -20,12 +20,12 @@ CLEANFILES += $(systemd_DATA)
 
 # the systemd upstart override
 upstart_overridedir = $(datadir)/upstart/systemd-session/upstart
-upstart_override_DATA = indicator-bluetooth.override
+upstart_override_DATA = ayatana-indicator-bluetooth.override
 EXTRA_DIST += $(upstart_override_DATA)
 
 # the upstart job file
 upstart_jobsdir = $(datadir)/upstart/sessions
-upstart_jobs_DATA = indicator-bluetooth.conf
+upstart_jobs_DATA = ayatana-indicator-bluetooth.conf
 upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
 $(upstart_jobs_DATA): $(upstart_jobs_in)
 	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
@@ -35,7 +35,7 @@ CLEANFILES += $(upstart_jobs_DATA)
 
 # the xdg autostart job file
 xdg_autostartdir = /etc/xdg/autostart
-xdg_autostart_DATA = indicator-bluetooth.desktop
+xdg_autostart_DATA = ayatana-indicator-bluetooth.desktop
 xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
 $(xdg_autostart_DATA): $(xdg_autostart_in)
 	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
@@ -44,14 +44,14 @@ EXTRA_DIST += $(xdg_autostart_in)
 CLEANFILES += $(xdg_autostart_DATA)
 
 # the gsettings schema
-gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
+gsettings_SCHEMAS = org.ayatana.indicator.bluetooth.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST += \
-  com.canonical.indicator.bluetooth.gschema.xml.in \
-  indicator-bluetooth.conf.in \
-  indicator-bluetooth.desktop.in
+  org.ayatana.indicator.bluetooth.gschema.xml.in \
+  ayatana-indicator-bluetooth.conf.in \
+  ayatana-indicator-bluetooth.desktop.in
 
 CLEANFILES += \
   $(dbus_services_DATA) \
diff --git a/data/indicator-bluetooth.conf.in b/data/ayatana-indicator-bluetooth.conf.in
index 5262391..5262391 100644
--- a/data/indicator-bluetooth.conf.in
+++ b/data/ayatana-indicator-bluetooth.conf.in
diff --git a/data/ayatana-indicator-bluetooth.desktop.in b/data/ayatana-indicator-bluetooth.desktop.in
new file mode 100644
index 0000000..8eb5e1f
--- /dev/null
+++ b/data/ayatana-indicator-bluetooth.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Ayatana Indicator Bluetooth
+Exec=@pkglibexecdir@/ayatana-indicator-bluetooth/ayatana-indicator-bluetooth-service
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+OnlyShowIn=Unity;MATE;XFCE;
diff --git a/data/indicator-bluetooth.override b/data/ayatana-indicator-bluetooth.override
index 2905494..2905494 100644
--- a/data/indicator-bluetooth.override
+++ b/data/ayatana-indicator-bluetooth.override
diff --git a/data/ayatana-indicator-bluetooth.service.in b/data/ayatana-indicator-bluetooth.service.in
new file mode 100644
index 0000000..92344c8
--- /dev/null
+++ b/data/ayatana-indicator-bluetooth.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=Ayatana Indicator Bluetooth Service
+PartOf=graphical-session.target
+PartOf=ayatana-indicators.target
+
+[Service]
+ExecStart=@pkglibexecdir@/ayatana-indicator-bluetooth/ayatana-indicator-bluetooth-service
+Restart=on-failure
+
+[Install]
+WantedBy=ayatana-indicators.target
diff --git a/data/com.canonical.indicator.bluetooth b/data/com.canonical.indicator.bluetooth
deleted file mode 100644
index 74e9c13..0000000
--- a/data/com.canonical.indicator.bluetooth
+++ /dev/null
@@ -1,19 +0,0 @@
-[Indicator Service]
-Name=indicator-bluetooth
-ObjectPath=/com/canonical/indicator/bluetooth
-Position=70
-
-[desktop]
-ObjectPath=/com/canonical/indicator/bluetooth/desktop
-
-[phone]
-ObjectPath=/com/canonical/indicator/bluetooth/phone
-Position=36
-
-[ubiquity]
-ObjectPath=/com/canonical/indicator/bluetooth/desktop
-
-[phone_greeter]
-ObjectPath=/com/canonical/indicator/bluetooth/phone
-Position=36
-
diff --git a/data/indicator-bluetooth.desktop.in b/data/indicator-bluetooth.desktop.in
deleted file mode 100644
index 6048c3c..0000000
--- a/data/indicator-bluetooth.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Bluetooth
-Exec=@pkglibexecdir@/indicator-bluetooth-service
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-OnlyShowIn=Unity;GNOME;
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/indicator-bluetooth.service.in b/data/indicator-bluetooth.service.in
deleted file mode 100644
index e99e610..0000000
--- a/data/indicator-bluetooth.service.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Indicator Bluetooth Backend
-PartOf=graphical-session.target
-After=indicators-pre.target
-
-[Service]
-ExecStart=@pkglibexecdir@/indicator-bluetooth-service
-Restart=on-failure
diff --git a/data/org.ayatana.indicator.bluetooth b/data/org.ayatana.indicator.bluetooth
new file mode 100644
index 0000000..a57ce0a
--- /dev/null
+++ b/data/org.ayatana.indicator.bluetooth
@@ -0,0 +1,19 @@
+[Indicator Service]
+Name=ayatana-indicator-bluetooth
+ObjectPath=/org/ayatana/indicator/bluetooth
+Position=70
+
+[desktop]
+ObjectPath=/org/ayatana/indicator/bluetooth/desktop
+
+[phone]
+ObjectPath=/org/ayatana/indicator/bluetooth/phone
+Position=36
+
+[ubiquity]
+ObjectPath=/org/ayatana/indicator/bluetooth/desktop
+
+[phone_greeter]
+ObjectPath=/org/ayatana/indicator/bluetooth/phone
+Position=36
+
diff --git a/data/com.canonical.indicator.bluetooth.gschema.xml.in b/data/org.ayatana.indicator.bluetooth.gschema.xml.in
index cb60641..e1f5f8e 100644
--- a/data/com.canonical.indicator.bluetooth.gschema.xml.in
+++ b/data/org.ayatana.indicator.bluetooth.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="com.canonical.indicator.bluetooth" path="/com/canonical/indicator/bluetooth/">
+  <schema id="org.ayatana.indicator.bluetooth" path="/org/ayatana/indicator/bluetooth/">
     <key name="visible" type="b">
       <default>true</default>
       <_summary>Whether or not to show the bluetooth indicator in the menu bar.</_summary>
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
index 2012021..e83f60c 100644
--- a/data/upstart/Makefile.am
+++ b/data/upstart/Makefile.am
@@ -5,8 +5,8 @@ CLEANFILES =
 # the upstart version of the xdg autostart job file
 # see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
 upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
-upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
-upstart_xdg_autostart_in = indicator-bluetooth.desktop.in
+upstart_xdg_autostart_DATA = ayatana-indicator-bluetooth.desktop
+upstart_xdg_autostart_in = ayatana-indicator-bluetooth.desktop.in
 $(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
 	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
@@ -14,4 +14,4 @@ EXTRA_DIST += $(upstart_xdg_autostart_in)
 CLEANFILES += $(upstart_xdg_autostart_DATA)
 
 EXTRA_DIST += \
-  indicator-bluetooth.upstart.desktop.in
+  ayatana-indicator-bluetooth.upstart.desktop.in
diff --git a/data/upstart/indicator-bluetooth.desktop.in b/data/upstart/ayatana-indicator-bluetooth.desktop.in
index 523cfa0..523cfa0 100644
--- a/data/upstart/indicator-bluetooth.desktop.in
+++ b/data/upstart/ayatana-indicator-bluetooth.desktop.in