9 files changed, 37 insertions, 43 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index a6a2e9f..395ffb2 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -4,7 +4,7 @@ include (UseGSettings)
 ##  GSettings schema
 ##
 
-set (SCHEMA_NAME "com.canonical.indicator.session.gschema.xml")
+set (SCHEMA_NAME "org.ayatana.indicator.session.gschema.xml")
 set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
 set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
 
@@ -79,18 +79,18 @@ install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
          RENAME "${XDG_AUTOSTART_NAME}")
 
 ##
-##  Unity Indicator File
+##  Ayatana Indicator File
 ##
 
 # where to install
-set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
-message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
+set (AYATANA_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators")
+message (STATUS "${AYATANA_INDICATOR_DIR} is the Ayatana Indicator install dir")
 
-set (UNITY_INDICATOR_NAME "com.canonical.indicator.session")
-set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
+set (AYATANA_INDICATOR_NAME "org.ayatana.indicator.session")
+set (AYATANA_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${AYATANA_INDICATOR_NAME}")
 
-install (FILES "${UNITY_INDICATOR_FILE}"
-         DESTINATION "${UNITY_INDICATOR_DIR}")
+install (FILES "${AYATANA_INDICATOR_FILE}"
+         DESTINATION "${AYATANA_INDICATOR_DIR}")
 
 
 ##
@@ -112,4 +112,3 @@ install (DIRECTORY icons
 
 install(CODE "execute_process (COMMAND gtk-update-icon-cache -t -f ${ICON_DIR})"
         CODE "message (STATUS \"Updating icon cache\")")
-
diff --git a/data/ayatana-indicator-session.conf.in b/data/ayatana-indicator-session.conf.in
new file mode 100644
index 0000000..d6474f4
--- /dev/null
+++ b/data/ayatana-indicator-session.conf.in
@@ -0,0 +1,9 @@
+description "Ayatana Indicator Session Service"
+
+start on ayatana-indicator-services-start
+stop on desktop-end or ayatana-indicator-services-end
+
+respawn
+respawn limit 2 10
+
+exec @pkglibexecdir@/ayatana-indicator-session-service
diff --git a/data/indicator-session.desktop.in b/data/ayatana-indicator-session.desktop.in
index 10dcadd..2ce63e0 100644
--- a/data/indicator-session.desktop.in
+++ b/data/ayatana-indicator-session.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Indicator Session
-Exec=@pkglibexecdir@/indicator-session-service
+Name=Ayatana Indicator Session
+Exec=@pkglibexecdir@/ayatana-indicator-session-service
 OnlyShowIn=Unity;GNOME;
 NoDisplay=true
 StartupNotify=false
diff --git a/data/indicator-session.upstart.desktop.in b/data/ayatana-indicator-session.upstart.desktop.in
index f4970f6..f1f70e1 100644
--- a/data/indicator-session.upstart.desktop.in
+++ b/data/ayatana-indicator-session.upstart.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Indicator Session
-Exec=@pkglibexecdir@/indicator-session-service
+Exec=@pkglibexecdir@/ayatana-indicator-session-service
 OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session
deleted file mode 100644
index e2ec730..0000000
--- a/data/com.canonical.indicator.session
+++ /dev/null
@@ -1,16 +0,0 @@
-[Indicator Service]
-Name=indicator-session
-ObjectPath=/com/canonical/indicator/session
-Position=10
-
-[desktop]
-ObjectPath=/com/canonical/indicator/session/desktop
-
-[desktop_greeter]
-ObjectPath=/com/canonical/indicator/session/desktop_greeter
-
-[desktop_lockscreen]
-ObjectPath=/com/canonical/indicator/session/desktop_lockscreen
-
-[ubiquity]
-ObjectPath=/com/canonical/indicator/session/desktop_greeter
diff --git a/data/indicator-session.conf.in b/data/indicator-session.conf.in
deleted file mode 100644
index c7530e3..0000000
--- a/data/indicator-session.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Indicator Session Service"
-
-start on indicator-services-start
-stop on desktop-end or indicator-services-end
-
-respawn
-respawn limit 2 10
-
-exec @pkglibexecdir@/indicator-session-service
diff --git a/data/indicator-session.convert b/data/indicator-session.convert
deleted file mode 100644
index c98eddb..0000000
--- a/data/indicator-session.convert
+++ /dev/null
@@ -1,5 +0,0 @@
-[com.canonical.indicator.session]
-suppress-logout-restart-shutdown = /apps/indicator-session/suppress_logout_restart_shutdown
-suppress-logout-menuitem = /apps/indicator-session/suppress_logout_menuitem
-suppress-restart-menuitem = /apps/indicator-session/suppress_restart_menuitem
-suppress-shutdown-menuitem = /apps/indicator-session/suppress_shutdown_menuitem
diff --git a/data/org.ayatana.indicator.session b/data/org.ayatana.indicator.session
new file mode 100644
index 0000000..f8a29b7
--- /dev/null
+++ b/data/org.ayatana.indicator.session
@@ -0,0 +1,16 @@
+[Indicator Service]
+Name=ayatana-indicator-session
+ObjectPath=/org/ayatana/indicator/session
+Position=10
+
+[desktop]
+ObjectPath=/org/ayatana/indicator/session/desktop
+
+[desktop_greeter]
+ObjectPath=/org/ayatana/indicator/session/desktop_greeter
+
+[desktop_lockscreen]
+ObjectPath=/org/ayatana/indicator/session/desktop_lockscreen
+
+[ubiquity]
+ObjectPath=/org/ayatana/indicator/session/desktop_greeter
diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/org.ayatana.indicator.session.gschema.xml.in
index d5e852e..0a83afe 100644
--- a/data/com.canonical.indicator.session.gschema.xml.in
+++ b/data/org.ayatana.indicator.session.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="com.canonical.indicator.session" path="/apps/indicator-session/">
+  <schema id="org.ayatana.indicator.session" path="/org/ayatana/indicator/session/">
     <key name="suppress-logout-restart-shutdown" type="b">
       <default>false</default>
       <_summary>Suppress the dialog to confirm logout, restart and shutdown action</_summary>