Merge lp:~larsu/unity/call-ido-init into lp:unity

[Lars Karlitski]

unity-panel-service: call ido_init() and honor indicator's position requests.

=== modified file 'debian/control'
--- debian/control	2013-06-27 18:16:29 +0000
+++ debian/control	2013-06-28 18:39:32 +0000
@@ -23,8 +23,8 @@
                libcairo2-dev,
                libpango1.0-dev,
                libdee-dev (>= 1.0.0),
-               libindicator-dev (>= 0.4.90),
-               libindicator3-dev (>= 0.4.90),
+               libindicator-dev (>= 0.12.2),
+               libindicator3-dev (>= 0.12.2),
                libunity-misc-dev (>= 4.0.4),
                libgrail-dev (>= 1.0.20),
                libxcb-icccm4-dev,

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2013-06-17 11:16:12 +0000
+++ services/CMakeLists.txt	2013-06-28 18:39:32 +0000
@@ -9,8 +9,9 @@
     gobject-2.0
     gthread-2.0
     gtk+-3.0>=3.3
-    indicator3-0.4>=0.4.90
+    indicator3-0.4>=12.10.2
     x11
+    libido3-0.1>=13.0.0
 )
 
 pkg_check_modules(SERVICE_DEPS REQUIRED ${UNITY_PANEL_SERVICE_DEPS})

=== modified file 'services/panel-main.c'
--- services/panel-main.c	2012-12-05 14:52:45 +0000
+++ services/panel-main.c	2013-06-28 18:39:32 +0000
@@ -21,6 +21,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
+#include <libido/libido.h>
 
 #include "config.h"
 #include "panel-a11y.h"
@@ -388,6 +389,7 @@
   gtk_init (&argc, &argv);
   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default(),
 				     INDICATORICONDIR);
+  ido_init ();
 
   if (g_getenv ("SILENT_PANEL_SERVICE") != NULL)
   {

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2013-04-23 20:44:20 +0000
+++ services/panel-service.c	2013-06-28 18:39:32 +0000
@@ -1113,48 +1113,29 @@
   return -1;
 }
 
-static gint
-name2priority (const gchar * name, const gchar * hint)
-{
-  gint order = name2order (name, hint);
-  if (order > -1)
-    return order * MAX_INDICATOR_ENTRIES;
-
-  return order;
-}
-
-static int
-indicator_compare_func (IndicatorObject *o1, IndicatorObject *o2)
-{
-  gchar *s1;
-  gchar *s2;
-  int    i1;
-  int    i2;
-
-  s1 = g_object_get_data (G_OBJECT (o1), "id");
-  s2 = g_object_get_data (G_OBJECT (o2), "id");
-
-  i1 = name2order (s1, NULL);
-  i2 = name2order (s2, NULL);
-
-  return i1 - i2;
-}
-
 static void
 sort_indicators (PanelService *self)
 {
   GSList *i;
   int     k = 0;
-  int     prio = 0;
-
-  self->priv->indicators = g_slist_sort (self->priv->indicators,
-                                         (GCompareFunc)indicator_compare_func);
 
   for (i = self->priv->indicators; i; i = i->next)
     {
-      prio = name2priority(g_object_get_data (G_OBJECT (i->data), "id"), NULL);
-      if (prio < 0) continue;
-      g_object_set_data (G_OBJECT (i->data), "priority", GINT_TO_POINTER (prio));
+      IndicatorObject *io = i->data;
+      gint pos;
+
+      pos = indicator_object_get_position (io);
+
+      /* Continue using the state ordering as long as there are still
+       * plugins statically defined in this file. Give them a much
+       * higher position though, so that they appear to the right of the
+       * indicators that return a proper position */
+      if (pos < 0)
+        pos = 1000 - name2order (g_object_get_data (G_OBJECT (io), "id"), NULL);
+
+      /* unity's concept of priorities is inverse to ours right now */
+      g_object_set_data (G_OBJECT (i->data), "priority", GINT_TO_POINTER (1000 - pos));
+
       g_object_set_data (G_OBJECT (i->data), "position", GINT_TO_POINTER (k));
       self->priv->timeouts[k] = SYNC_NEUTRAL;
       k++;
@@ -1277,16 +1258,8 @@
           IndicatorObjectEntry *entry = e->data;
           gchar *id = get_indicator_entry_id_by_entry (entry);
 
-          if (entry->name_hint)
-            {
-              prio = name2priority(indicator_id, entry->name_hint);
-            }
-
-          if (prio == -1)
-            {
-              prio = parent_prio + index;
-              index++;
-            }
+          prio = parent_prio + index;
+          index++;
 
           indicator_entry_to_variant (entry, id, indicator_id, b, prio);
           g_free (id);
@@ -1583,7 +1556,6 @@
 
   for (l = indicators; l; l = l->next)
     {
-      const gchar *indicator_id = g_object_get_data (G_OBJECT (l->data), "id");
       gint parent_priority = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (l->data), "priority"));
       entries = indicator_object_get_entries (l->data);
       if (entries)
@@ -1598,16 +1570,8 @@
               if (!panel_service_entry_is_visible (self, new_entry))
                 continue;
 
-              if (new_entry->name_hint)
-                {
-                  prio = name2priority(indicator_id, new_entry->name_hint);
-                }
-
-              if (prio == -1)
-                {
-                  prio = parent_priority + index;
-                  index++;
-                }
+              prio = parent_priority + index;
+              index++;
 
               gpointer *values = g_new (gpointer, 2);
               values[0] = new_entry;