From 9f47961302b87d139326f4a08f045ee5ab03248b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 5 Nov 2015 13:52:17 +0100
Subject: Use org.ayatana namespace for Ayatana indicators.

---
 data/org.ArcticaProject.arctica-greeter.gschema.xml | 2 +-
 src/menubar.vala                                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml
index 7437e9c..bcd9ec3 100644
--- a/data/org.ArcticaProject.arctica-greeter.gschema.xml
+++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml
@@ -95,7 +95,7 @@
       <summary>Whether to play sound when greeter is ready</summary>
     </key>
     <key name="indicators" type="as">
-      <default>['ug-accessibility', 'com.canonical.indicator.keyboard', 'com.canonical.indicator.session', 'com.canonical.indicator.datetime', 'com.canonical.indicator.power', 'com.canonical.indicator.sound', 'application']</default>
+      <default>['ug-accessibility', 'org.ayatana.indicator.keyboard', 'org.ayatana.indicator.session', 'org.ayatana.indicator.datetime', 'org.ayatana.indicator.power', 'org.ayatana.indicator.sound', 'application']</default>
       <summary>Which indicators to load</summary>
     </key>
     <key name="hidden-users" type="as">
diff --git a/src/menubar.vala b/src/menubar.vala
index 886b158..17a5ad7 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -244,9 +244,9 @@ public class MenuBar : Gtk.MenuBar
     //  string path;
     //  Indicator.Object io;
 
-    //  /* To stay backwards compatible, use com.canonical.indicator as the default prefix */
+    //  /* To stay backwards compatible, use org.ayatana.indicator as the default prefix */
     //  if (indicator_name.index_of_char ('.') < 0)
-    //      path = @"$dir/com.canonical.indicator.$indicator_name";
+    //      path = @"$dir/org.ayatana.indicator.$indicator_name";
     //  else
     //      path = @"$dir/$indicator_name";
 
@@ -345,7 +345,7 @@ public class MenuBar : Gtk.MenuBar
         {
             if (indicator_list[i] == "ug-keyboard")
             {
-                indicator_list[i] = "com.canonical.indicator.keyboard";
+                indicator_list[i] = "org.ayatana.indicator.keyboard";
                 update_indicator_list = true;
             }
         }
-- 
cgit v1.2.3