Merge lp:~mterry/unity-greeter/indicator-gsettings into lp:unity-greeter

[Michael Terry]

Allow system administrators to specify a different list of indicators by making it customizable via gsettings.

Allow system administrators to specify a different list of indicators by making it customizable via gsettings.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:776
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/./label=precise/5/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/5//rebuild/?

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml	2012-09-11 17:52:41 +0000
+++ data/com.canonical.unity-greeter.gschema.xml	2013-03-04 17:51:25 +0000
@@ -82,5 +82,9 @@
       <default>true</default>
       <summary>Whether to play sound when greeter is ready</summary>
     </key>
+    <key name="indicators" type="as">
+      <default>['ug-keyboard', 'ug-accessibility', 'session', 'datetime', 'power', 'soundmenu', 'application']</default>
+      <summary>Which indicators to load</summary>
+    </key>
   </schema>
 </schemalist>

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2013-02-20 16:17:42 +0000
+++ src/menubar.vala	2013-03-04 17:51:25 +0000
@@ -322,6 +322,42 @@
         return keyboard_item;
     }
 
+    private void load_indicator (string indicator_name)
+    {
+        if (indicator_name == "ug-keyboard")
+        {
+            var keyboard_item = make_keyboard_indicator ();
+            insert (keyboard_item, (int) get_children ().length () - 1);
+        }
+        else if (indicator_name == "ug-accessibility")
+        {
+            var a11y_item = make_a11y_indicator ();
+            insert (a11y_item, (int) get_children ().length () - 1);
+        }
+        else
+        {
+            // Find file, if it exists
+            string[] names_to_try = {"lib" + indicator_name + ".so",
+                                     indicator_name + ".so",
+                                     indicator_name};
+            foreach (var filename in names_to_try)
+            {
+                var full_path = Path.build_filename (Config.INDICATORDIR, filename);
+                var io = new Indicator.Object.from_file (full_path);
+                if (io == null)
+                    continue;
+
+                indicator_objects.append (io);
+                io.entry_added.connect (indicator_added_cb);
+                io.entry_removed.connect (indicator_removed_cb);
+                foreach (var entry in io.get_entries ())
+                    indicator_added_cb (io, entry);
+
+                break;
+            }
+        }
+    }
+
     private void setup_indicators ()
     {
         /* Set indicators to run with reduced functionality */
@@ -334,30 +370,12 @@
         /* Hint to have gnome-settings-daemon run in greeter mode */
         greeter_set_env ("RUNNING_UNDER_GDM", "1");
 
-        var keyboard_item = make_keyboard_indicator ();
-        insert (keyboard_item, (int) get_children ().length () - 1);
-
-        var a11y_item = make_a11y_indicator ();
-        insert (a11y_item, (int) get_children ().length () - 1);
-
         debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
-        string[] filenames = { Path.build_filename (Config.INDICATORDIR, "libsession.so"),
-                               Path.build_filename (Config.INDICATORDIR, "libdatetime.so"),
-                               Path.build_filename (Config.INDICATORDIR, "libpower.so"),
-                               Path.build_filename (Config.INDICATORDIR, "libsoundmenu.so"),
-                               Path.build_filename (Config.INDICATORDIR, "libapplication.so") };
-        foreach (var filename in filenames)
-        {
-            var io = new Indicator.Object.from_file (filename);
-            if (io == null)
-                continue;
-
-            indicator_objects.append (io);
-            io.entry_added.connect (indicator_added_cb);
-            io.entry_removed.connect (indicator_removed_cb);
-            foreach (var entry in io.get_entries ())
-                indicator_added_cb (io, entry);
-        }
+
+        var indicator_list = UGSettings.get_strv(UGSettings.KEY_INDICATORS);
+        foreach (var indicator in indicator_list)
+            load_indicator(indicator);
+
         debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
     }
 

=== modified file 'src/settings.vala'
--- src/settings.vala	2012-09-11 17:52:41 +0000
+++ src/settings.vala	2013-03-04 17:51:25 +0000
@@ -37,6 +37,7 @@
     public static const string KEY_HIGH_CONTRAST = "high-contrast";
     public static const string KEY_SCREEN_READER = "screen-reader";
     public static const string KEY_PLAY_READY_SOUND = "play-ready-sound";
+    public static const string KEY_INDICATORS = "indicators";
 
     public static bool get_boolean (string key)
     {
@@ -75,5 +76,11 @@
         return gsettings.set_boolean (key, value);
     }
 
+    public static string[] get_strv (string key)
+    {
+        var gsettings = new Settings (SCHEMA);
+        return gsettings.get_strv (key);
+    }
+
     private static const string SCHEMA = "com.canonical.unity-greeter";
 }