Fork ayatana-indicator-datetime from Ubuntu's indicator-datetime.

6 files changed, 26 insertions, 26 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index d66c865..278b7e3 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,7 +3,7 @@
 ##
 
 include (UseGSettings)
-set (SCHEMA_NAME "com.canonical.indicator.datetime.gschema.xml")
+set (SCHEMA_NAME "org.ayatana.indicator.datetime.gschema.xml")
 set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
 set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
 
@@ -80,10 +80,10 @@ install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
 ##
 
 # where to install
-set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
+set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators")
 message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
 
-set (UNITY_INDICATOR_NAME "com.canonical.indicator.datetime")
+set (UNITY_INDICATOR_NAME "org.ayatana.indicator.datetime")
 set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
 
 install (FILES "${UNITY_INDICATOR_FILE}"
diff --git a/data/com.canonical.indicator.datetime b/data/com.canonical.indicator.datetime
deleted file mode 100644
index 1df0d33..0000000
--- a/data/com.canonical.indicator.datetime
+++ /dev/null
@@ -1,20 +0,0 @@
-[Indicator Service]
-Name=indicator-datetime
-ObjectPath=/com/canonical/indicator/datetime
-Position=20
-
-[desktop]
-ObjectPath=/com/canonical/indicator/datetime/desktop
-
-[desktop_greeter]
-ObjectPath=/com/canonical/indicator/datetime/desktop_greeter
-
-[desktop_lockscreen]
-ObjectPath=/com/canonical/indicator/datetime/desktop_greeter
-
-[phone]
-ObjectPath=/com/canonical/indicator/datetime/phone
-
-[phone_greeter]
-ObjectPath=/com/canonical/indicator/datetime/phone_greeter
-
diff --git a/data/indicator-datetime.desktop.in b/data/indicator-datetime.desktop.in
index 7d57c8d..ab1174d 100644
--- a/data/indicator-datetime.desktop.in
+++ b/data/indicator-datetime.desktop.in
@@ -2,7 +2,7 @@
 Type=Application
 Name=Indicator Date & Time
 Exec=@pkglibexecdir@/indicator-datetime-service
-OnlyShowIn=Unity;GNOME;Pantheon;
+OnlyShowIn=MATE;Unity;GNOME;Pantheon;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
diff --git a/data/org.ayatana.indicator.datetime b/data/org.ayatana.indicator.datetime
new file mode 100644
index 0000000..1219c2e
--- /dev/null
+++ b/data/org.ayatana.indicator.datetime
@@ -0,0 +1,20 @@
+[Indicator Service]
+Name=indicator-datetime
+ObjectPath=/org/ayatana/indicator/datetime
+Position=20
+
+[desktop]
+ObjectPath=/org/ayatana/indicator/datetime/desktop
+
+[desktop_greeter]
+ObjectPath=/org/ayatana/indicator/datetime/desktop_greeter
+
+[desktop_lockscreen]
+ObjectPath=/org/ayatana/indicator/datetime/desktop_greeter
+
+[phone]
+ObjectPath=/org/ayatana/indicator/datetime/phone
+
+[phone_greeter]
+ObjectPath=/org/ayatana/indicator/datetime/phone_greeter
+
diff --git a/data/com.canonical.indicator.datetime.AlarmProperties.xml b/data/org.ayatana.indicator.datetime.AlarmProperties.xml
index 7ba0e5e..eb306a6 100644
--- a/data/com.canonical.indicator.datetime.AlarmProperties.xml
+++ b/data/org.ayatana.indicator.datetime.AlarmProperties.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-  <interface name="com.canonical.indicator.datetime.AlarmProperties">
+  <interface name="org.ayatana.indicator.datetime.AlarmProperties">
 
     <property name="DefaultSound" type="s" access="readwrite">
       <doc:doc>
diff --git a/data/com.canonical.indicator.datetime.gschema.xml.in b/data/org.ayatana.indicator.datetime.gschema.xml.in
index cd0a26d..a83c658 100644
--- a/data/com.canonical.indicator.datetime.gschema.xml.in
+++ b/data/org.ayatana.indicator.datetime.gschema.xml.in
@@ -5,7 +5,7 @@
 		<value nick="24-hour" value="2" />
 		<value nick="custom" value="3" />
 	</enum>
-	<schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime">
+	<schema id="com.canonical.indicator.datetime" path="/org/ayatana/indicator/datetime/" gettext-domain="indicator-datetime">
 		<key name="show-clock" type="b">
 			<default>true</default>
 			<_summary>Show the clock in the panel</_summary>