From 0f33bc4be7e9dffaa6b68cd758c3c531460c9a2f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 12 Nov 2015 08:40:14 +0100
Subject: Fork from Ubuntu's indicator-power code project.

---
 data/CMakeLists.txt                               | 14 ++++----
 data/ayatana-indicator-power.conf.in              |  9 ++++++
 data/ayatana-indicator-power.desktop.in           |  9 ++++++
 data/ayatana-indicator-power.upstart.desktop.in   | 10 ++++++
 data/com.canonical.indicator.power                | 24 --------------
 data/com.canonical.indicator.power.Battery.xml    | 23 -------------
 data/com.canonical.indicator.power.Testing.xml    | 39 -----------------------
 data/com.canonical.indicator.power.gschema.xml.in | 24 --------------
 data/indicator-power.conf.in                      |  9 ------
 data/indicator-power.desktop.in                   |  9 ------
 data/indicator-power.upstart.desktop.in           | 10 ------
 data/org.ayatana.indicator.power                  | 24 ++++++++++++++
 data/org.ayatana.indicator.power.Battery.xml      | 23 +++++++++++++
 data/org.ayatana.indicator.power.Testing.xml      | 39 +++++++++++++++++++++++
 data/org.ayatana.indicator.power.gschema.xml.in   | 24 ++++++++++++++
 15 files changed, 145 insertions(+), 145 deletions(-)
 create mode 100644 data/ayatana-indicator-power.conf.in
 create mode 100644 data/ayatana-indicator-power.desktop.in
 create mode 100644 data/ayatana-indicator-power.upstart.desktop.in
 delete mode 100644 data/com.canonical.indicator.power
 delete mode 100644 data/com.canonical.indicator.power.Battery.xml
 delete mode 100644 data/com.canonical.indicator.power.Testing.xml
 delete mode 100644 data/com.canonical.indicator.power.gschema.xml.in
 delete mode 100644 data/indicator-power.conf.in
 delete mode 100644 data/indicator-power.desktop.in
 delete mode 100644 data/indicator-power.upstart.desktop.in
 create mode 100644 data/org.ayatana.indicator.power
 create mode 100644 data/org.ayatana.indicator.power.Battery.xml
 create mode 100644 data/org.ayatana.indicator.power.Testing.xml
 create mode 100644 data/org.ayatana.indicator.power.gschema.xml.in

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 0750128..0d903b9 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,7 +3,7 @@
 ##
 
 include (UseGSettings)
-set (SCHEMA_NAME "com.canonical.indicator.power.gschema.xml")
+set (SCHEMA_NAME "org.ayatana.indicator.power.gschema.xml")
 set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
 set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
 
@@ -80,11 +80,11 @@ install (FILES "${UPSTART_XDG_AUTOSTART_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 Unity Indicator install dir")
 
-set (UNITY_INDICATOR_NAME "com.canonical.indicator.power")
-set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
+set (AYATANA_INDICATOR_NAME "org.ayatana.indicator.power")
+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}")
diff --git a/data/ayatana-indicator-power.conf.in b/data/ayatana-indicator-power.conf.in
new file mode 100644
index 0000000..665fb35
--- /dev/null
+++ b/data/ayatana-indicator-power.conf.in
@@ -0,0 +1,9 @@
+description "Indicator Power Service"
+
+start on indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+respawn limit 2 10
+
+exec @pkglibexecdir@/indicator-power-service
diff --git a/data/ayatana-indicator-power.desktop.in b/data/ayatana-indicator-power.desktop.in
new file mode 100644
index 0000000..c2fd54c
--- /dev/null
+++ b/data/ayatana-indicator-power.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Power
+Exec=@pkglibexecdir@/indicator-power-service
+OnlyShowIn=Unity;GNOME;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/ayatana-indicator-power.upstart.desktop.in b/data/ayatana-indicator-power.upstart.desktop.in
new file mode 100644
index 0000000..5f95f8e
--- /dev/null
+++ b/data/ayatana-indicator-power.upstart.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Power
+Exec=@pkglibexecdir@/indicator-power-service
+OnlyShowIn=Unity;GNOME;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+AutostartCondition=GNOME3 unless-session gnome
+Hidden=true
diff --git a/data/com.canonical.indicator.power b/data/com.canonical.indicator.power
deleted file mode 100644
index f94ed0f..0000000
--- a/data/com.canonical.indicator.power
+++ /dev/null
@@ -1,24 +0,0 @@
-[Indicator Service]
-Name=indicator-power
-ObjectPath=/com/canonical/indicator/power
-Position=40
-
-[phone]
-ObjectPath=/com/canonical/indicator/power/phone
-Position=25
-
-[desktop]
-ObjectPath=/com/canonical/indicator/power/desktop
-
-[desktop_greeter]
-ObjectPath=/com/canonical/indicator/power/desktop_greeter
-
-[desktop_lockscreen]
-ObjectPath=/com/canonical/indicator/power/desktop_greeter
-
-[phone_greeter]
-ObjectPath=/com/canonical/indicator/power/phone
-Position=25
-
-[ubiquity]
-ObjectPath=/com/canonical/indicator/power/desktop_greeter
diff --git a/data/com.canonical.indicator.power.Battery.xml b/data/com.canonical.indicator.power.Battery.xml
deleted file mode 100644
index eca4524..0000000
--- a/data/com.canonical.indicator.power.Battery.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.power.Battery">
-
-    <property name="PowerLevel" type="s" access="read">
-      <doc:doc>
-        <doc:description>
-          <doc:para>The battery's power level. Possible values: 'ok', 'low', 'very_low', 'critical'</doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-
-    <property name="IsWarning" type="b" access="read">
-      <doc:doc>
-        <doc:description>
-          <doc:para>Whether or not indicator-power-service is warning the user about low battery power.</doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-
-  </interface>
-</node>
diff --git a/data/com.canonical.indicator.power.Testing.xml b/data/com.canonical.indicator.power.Testing.xml
deleted file mode 100644
index 72cf6cf..0000000
--- a/data/com.canonical.indicator.power.Testing.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.power.Testing">
-
-    <property name="MockBatteryEnabled" type="b" access="readwrite">
-      <doc:doc>
-        <doc:description>
-          <doc:para>Whether or not the mock battery is enabled. (Default: false)</doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-
-    <property name="MockBatteryLevel" type="u" access="readwrite">
-      <doc:doc>
-        <doc:description>
-          <doc:para>The charge level of the mock battery (0-100%, Default: 50%)</doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-
-    <property name="MockBatteryState" type="s" access="readwrite">
-      <doc:doc>
-        <doc:description>
-          <doc:para>The mock battery's state. Possible values: 'charging', 'discharging' (Default: 'discharging')</doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-
-    <property name="MockBatteryMinutesLeft" type="u" access="readwrite">
-      <doc:doc>
-        <doc:description>
-          <doc:para>Minutes left until the mock battery finishes charging/discharging (Default: 30)</doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-
-  </interface>
-</node>
diff --git a/data/com.canonical.indicator.power.gschema.xml.in b/data/com.canonical.indicator.power.gschema.xml.in
deleted file mode 100644
index 4fd2620..0000000
--- a/data/com.canonical.indicator.power.gschema.xml.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist>
-  <enum id="icon-policy-enum">
-    <value nick="present" value="0" />
-    <value nick="charge" value="1" />
-    <value nick="never" value="2" />
-  </enum>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.indicator.power" path="/com/canonical/indicator/power/">
-    <key name="show-time" type="b">
-      <default>false</default>
-      <_summary>Show time in Menu Bar</_summary>
-      <_description>Whether or not to show the time in the menu bar.</_description>
-    </key>
-    <key name="show-percentage" type="b">
-      <default>false</default>
-      <_summary>Show percentage in Menu Bar</_summary>
-      <_description>Whether or not to show the percentage in the menu bar.</_description>
-    </key>
-    <key enum="icon-policy-enum" name="icon-policy">
-      <default>"present"</default>
-      <_summary>When to show the battery status in the menu bar.</_summary>
-      <_description>Options for when to show battery status. Valid options are "present", "charge", and "never".</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/indicator-power.conf.in b/data/indicator-power.conf.in
deleted file mode 100644
index 665fb35..0000000
--- a/data/indicator-power.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Indicator Power Service"
-
-start on indicator-services-start
-stop on desktop-end or indicator-services-end
-
-respawn
-respawn limit 2 10
-
-exec @pkglibexecdir@/indicator-power-service
diff --git a/data/indicator-power.desktop.in b/data/indicator-power.desktop.in
deleted file mode 100644
index c2fd54c..0000000
--- a/data/indicator-power.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Power
-Exec=@pkglibexecdir@/indicator-power-service
-OnlyShowIn=Unity;GNOME;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/indicator-power.upstart.desktop.in b/data/indicator-power.upstart.desktop.in
deleted file mode 100644
index 5f95f8e..0000000
--- a/data/indicator-power.upstart.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Power
-Exec=@pkglibexecdir@/indicator-power-service
-OnlyShowIn=Unity;GNOME;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
-Hidden=true
diff --git a/data/org.ayatana.indicator.power b/data/org.ayatana.indicator.power
new file mode 100644
index 0000000..1625507
--- /dev/null
+++ b/data/org.ayatana.indicator.power
@@ -0,0 +1,24 @@
+[Indicator Service]
+Name=indicator-power
+ObjectPath=/org.ayatana.indicator/power
+Position=40
+
+[phone]
+ObjectPath=/org.ayatana.indicator/power/phone
+Position=25
+
+[desktop]
+ObjectPath=/org.ayatana.indicator/power/desktop
+
+[desktop_greeter]
+ObjectPath=/org.ayatana.indicator/power/desktop_greeter
+
+[desktop_lockscreen]
+ObjectPath=/org.ayatana.indicator/power/desktop_greeter
+
+[phone_greeter]
+ObjectPath=/org.ayatana.indicator/power/phone
+Position=25
+
+[ubiquity]
+ObjectPath=/org.ayatana.indicator/power/desktop_greeter
diff --git a/data/org.ayatana.indicator.power.Battery.xml b/data/org.ayatana.indicator.power.Battery.xml
new file mode 100644
index 0000000..cfb4b01
--- /dev/null
+++ b/data/org.ayatana.indicator.power.Battery.xml
@@ -0,0 +1,23 @@
+<?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="org.ayatana.indicator.power.Battery">
+
+    <property name="PowerLevel" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>The battery's power level. Possible values: 'ok', 'low', 'very_low', 'critical'</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="IsWarning" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Whether or not indicator-power-service is warning the user about low battery power.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+  </interface>
+</node>
diff --git a/data/org.ayatana.indicator.power.Testing.xml b/data/org.ayatana.indicator.power.Testing.xml
new file mode 100644
index 0000000..a0d7f50
--- /dev/null
+++ b/data/org.ayatana.indicator.power.Testing.xml
@@ -0,0 +1,39 @@
+<?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="org.ayatana.indicator.power.Testing">
+
+    <property name="MockBatteryEnabled" type="b" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Whether or not the mock battery is enabled. (Default: false)</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="MockBatteryLevel" type="u" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>The charge level of the mock battery (0-100%, Default: 50%)</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="MockBatteryState" type="s" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>The mock battery's state. Possible values: 'charging', 'discharging' (Default: 'discharging')</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="MockBatteryMinutesLeft" type="u" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Minutes left until the mock battery finishes charging/discharging (Default: 30)</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+  </interface>
+</node>
diff --git a/data/org.ayatana.indicator.power.gschema.xml.in b/data/org.ayatana.indicator.power.gschema.xml.in
new file mode 100644
index 0000000..901135b
--- /dev/null
+++ b/data/org.ayatana.indicator.power.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist>
+  <enum id="icon-policy-enum">
+    <value nick="present" value="0" />
+    <value nick="charge" value="1" />
+    <value nick="never" value="2" />
+  </enum>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.ayatana.indicator.power" path="/org.ayatana.indicator/power/">
+    <key name="show-time" type="b">
+      <default>false</default>
+      <_summary>Show time in Menu Bar</_summary>
+      <_description>Whether or not to show the time in the menu bar.</_description>
+    </key>
+    <key name="show-percentage" type="b">
+      <default>false</default>
+      <_summary>Show percentage in Menu Bar</_summary>
+      <_description>Whether or not to show the percentage in the menu bar.</_description>
+    </key>
+    <key enum="icon-policy-enum" name="icon-policy">
+      <default>"present"</default>
+      <_summary>When to show the battery status in the menu bar.</_summary>
+      <_description>Options for when to show battery status. Valid options are "present", "charge", and "never".</_description>
+    </key>
+  </schema>
+</schemalist>
-- 
cgit v1.2.3