Merge lp:~parnold-x/wingpanel-indicator-ayatana/restrict_loading into lp:~wingpanel-devs/wingpanel-indicator-ayatana/trunk

[Djax]

restrict loading to libapplication.so

Restrict loading to libapplication.so
So when people install things like libappmenu and stuff these will not be loaded.

[David Hewitt (davidmhewitt)]

libapplication.so seems to be the only one we need to concern ourselves with.

The other possible .so files that could live in that directory either duplicate functionality we have in other wingpanel indicators or break things entirely like in the case of libappmenu.so.

review: Approve (code, function)

=== modified file 'src/IndicatorFactory.vala'
--- src/IndicatorFactory.vala	2015-05-07 20:29:38 +0000
+++ src/IndicatorFactory.vala	2016-09-11 10:24:25 +0000
@@ -24,40 +24,20 @@
     public Gee.Collection<IndicatorIface> get_indicators () {
         if (indicators == null) {
             indicators = new Gee.LinkedList<IndicatorIface> ();
-            load_indicators ();
+            load_indicator (File.new_for_path (Constants.AYANATAINDICATORDIR), "libapplication.so");
         }
 
         return indicators.read_only_view;
     }
 
-    private void load_indicators () {
-        load_indicators_from_dir (Constants.AYANATAINDICATORDIR);
-    }
-
-    private void load_indicators_from_dir (string dir_path) {
-        try {
-            var dir = File.new_for_path (dir_path);
-            var enumerator = dir.enumerate_children (FileAttribute.STANDARD_NAME,
-                                                     FileQueryInfoFlags.NONE, null);
-            FileInfo file_info;
-
-            while ((file_info = enumerator.next_file (null)) != null) {
-                string name = file_info.get_name ();
-                load_indicator (dir, name);
-            }
-        } catch (Error err) {
-            warning ("Unable to read indicators: %s", err.message);
-        }
-    }
-
     private void load_indicator (File parent_dir, string name) {
         string indicator_path = parent_dir.get_child (name).get_path ();
-
+        if (!File.new_for_path (indicator_path).query_exists ()) {
+            debug ("No ayatana support possible because there is no Indicator Library: %s", name);
+            return;
+        }
         IndicatorAyatana.Object indicator = null;
 
-        if (!name.has_suffix (".so"))
-            return;
-
         debug ("Loading Indicator Library: %s", name);
         indicator = new IndicatorAyatana.Object.from_file (indicator_path);