Merge lp:~larsu/unity/support-indicator-ng into lp:unity

[Lars Karlitski]

panel-service: add support for indicator-ng

Picks up indicators on the bus that have a service file in /usr/share/unity/indicators.

panel-service: add support for indicator-ng

Picks up indicators on the bus that have a service file in /usr/share/unity/indicators. Indicators picked up this way are added to the left of all other indicators until we find a good way to set priorities.

[Marco Trevisan (Treviño) (3v1n0)]

Why not using g_file_enumerate_children(_async) instead of g_dir_read_name?

[Lars Karlitski (larsu)]

Thought about that, but didn't see a benefit in using it. We only need the names anyway.

Also, this mirrors what load_indicators does.

[Marco Trevisan (Treviño) (3v1n0)]

The reason I said this is not to use sync operations on startup, considering also that this is ran on startup

[Lars Karlitski (larsu)]

I don't think that making this asynchronous will give us any benefit. The panel service has to know about all indicators before showing anything anyways, to avoid having indicators appear one after another.

Not that this is not a regression: indicator plugins are also loaded synchronously (and they need much longer to be loaded, since they have to be dlopened).

[Marco Trevisan (Treviño) (3v1n0)]

No regression indeed, it was just a nice to have...

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-01-18 16:59:54 +0000
+++ CMakeLists.txt	2013-02-18 19:43:26 +0000
@@ -135,6 +135,7 @@
 set (VERSION "${UNITY_VERSION}")
 set (BUILDDIR "${CMAKE_BINARY_DIR}")
 set (TESTDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
+set (INDICATOR_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/share/unity/indicators")
 
 find_package (PkgConfig)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} unity --variable lensesdir OUTPUT_VARIABLE LENSES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)

=== modified file 'config.h.cmake'
--- config.h.cmake	2012-12-05 14:52:45 +0000
+++ config.h.cmake	2013-02-18 19:43:26 +0000
@@ -17,5 +17,8 @@
 #ifndef INDICATORICONDIR
 #cmakedefine INDICATORICONDIR "@INDICATORICONDIR@"
 #endif
+#ifndef INDICATOR_SERVICE_DIR
+#cmakedefine INDICATOR_SERVICE_DIR "@INDICATOR_SERVICE_DIR@"
+#endif
 
 #endif // CONFIG_H

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2013-02-04 21:12:57 +0000
+++ services/panel-service.c	2013-02-18 19:43:26 +0000
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n-lib.h>
+#include <libindicator/indicator-ng.h>
 
 #include <X11/extensions/XInput2.h>
 #include <X11/XKBlib.h>
@@ -123,6 +124,7 @@
                              IndicatorObject *object,
                              const gchar     *_name);
 static void load_indicators (PanelService    *self);
+static void load_indicators_from_indicator_files (PanelService *self);
 static void sort_indicators (PanelService    *self);
 
 static void notify_object (IndicatorObject *object);
@@ -557,6 +559,7 @@
 
   suppress_signals = TRUE;
   load_indicators (self);
+  load_indicators_from_indicator_files (self);
   sort_indicators (self);
   suppress_signals = FALSE;
 
@@ -1011,6 +1014,42 @@
   g_dir_close (dir);
 }
 
+static void
+load_indicators_from_indicator_files (PanelService *self)
+{
+  GDir *dir;
+  const gchar *name;
+  GError *error = NULL;
+
+  dir = g_dir_open (INDICATOR_SERVICE_DIR, 0, &error);
+  if (!dir)
+    {
+      g_warning ("unable to open indicator service file directory: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  while ((name = g_dir_read_name (dir)))
+    {
+      gchar *filename;
+      IndicatorNg *indicator;
+
+      filename = g_build_filename (INDICATOR_SERVICE_DIR, name, NULL);
+      indicator = indicator_ng_new_for_profile (filename, "desktop", &error);
+      if (indicator)
+        {
+          load_indicator (self, INDICATOR_OBJECT (indicator), NULL);
+        }
+      else
+        {
+          g_warning ("unable to load '%s': %s", name, error->message);
+          g_clear_error (&error);
+        }
+
+      g_free (filename);
+    }
+}
+
 static gint
 name2order (const gchar * name, const gchar * hint)
 {