Merge lp:~kazade/wingpanel/indicator-loading into lp:~elementary-pantheon/wingpanel/wingpanel

[Kazade]

[Cris Dywan (kalikiana)]

Please use critical() instead of print(), since the panel is unusable in that case. And please limit the lines to ~80 columns.

review: Needs Fixing

[Cris Dywan (kalikiana)]

Looks good and quickly tested, thanks a lot.

review: Approve

=== modified file 'wingpanel-config.vala'
--- wingpanel-config.vala	2010-12-20 23:12:54 +0000
+++ wingpanel-config.vala	2010-12-23 09:14:09 +0000
@@ -1,3 +1,3 @@
 namespace Wingpanel.Config {
-    public const string INDICATORDIR = "/usr/lib/indicators/4/";
+    public const string INDICATORDIR = "/usr/lib/indicators/";
 }
 
=== modified file 'wingpanel-indicator-file-model.vala'
--- wingpanel-indicator-file-model.vala	2010-12-22 15:31:51 +0000
+++ wingpanel-indicator-file-model.vala	2010-12-23 09:14:09 +0000
@@ -95,7 +95,30 @@
             //Gtk.IconTheme.get_default ().append_search_path (Wingpanel.Config.INDICATORICONSDIR);
 
             /* Start loading 'em in. .so are located in  INDICATORDIR*/
-            var dir = File.new_for_path (Wingpanel.Config.INDICATORDIR);
+
+            //Supported versions
+            ArrayList<string> versions = new Gee.ArrayList<string>();
+            versions.add("3");
+            versions.add("4");
+
+            File dir = null;
+            //See if any of the version directories exist in INDICATORDIR
+            foreach(string version in versions) {
+                var version_path = File.new_for_path (
+                        Wingpanel.Config.INDICATORDIR).get_child(version);
+                if (version_path.query_exists()) {
+                    dir = version_path;
+                    break;
+                }
+            }
+
+            //If none exist, then print an error and return
+            if(dir == null) {                
+                critical ("No indicatordirectory found in: %s. Check configuration.",
+                            Wingpanel.Config.INDICATORDIR);
+                return;
+            }
+            
             try
             {
                 var e = dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, 0, null);
@@ -123,7 +146,7 @@
                 sos.sort ((CompareFunc)indicator_sort_func);
 
                 foreach (string leaf in sos)
-                    this.load_indicator (Wingpanel.Config.INDICATORDIR + leaf, leaf);
+                    this.load_indicator (dir.get_path() + "/" + leaf, leaf);
             }
             catch (Error error)
             {