Merge lp:~larsu/ubiquity/fix-indicators into lp:ubiquity

[Lars Karlitski]

Port to new indicator architecture.

=== modified file 'configure.ac'
--- configure.ac	2013-07-11 18:23:07 +0000
+++ configure.ac	2013-07-29 17:32:28 +0000
@@ -25,11 +25,14 @@
 
 GTK3_REQUIRED=3.1.4
 GIO_REQUIRED=2.5.11
+INDICATOR_REQUIRED=12.10.2
+IDO_REQUIRED=13.10.1
 
 if test "x$UBIQUITY_NO_GTK" = x; then
   PKG_CHECK_MODULES(PANEL, [glib-2.0
 			  gtk+-3.0 >= $GTK3_REQUIRED
-			  indicator3-0.4
+			  indicator3-0.4 >= $INDICATOR_REQUIRED
+			  libido3-0.1 >= $IDO_REQUIRED
 			  x11])
   AC_SUBST(PANEL_CFLAGS)
   AC_SUBST(PANEL_LIBS)
@@ -62,6 +65,9 @@
 pixmapsdir="${datadir}/${PACKAGE}/pixmaps"
 AC_SUBST([pixmapsdir])
 
+INDICATOR_DIR=${datadir}/unity/indicators
+AC_SUBST(INDICATOR_DIR)
+
 AC_CONFIG_FILES([
 	Makefile
 	data/Makefile

=== modified file 'debian/control'
--- debian/control	2013-07-01 11:32:25 +0000
+++ debian/control	2013-07-29 17:32:28 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Installer Team <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>, Evan Dandrea <[e-mail]>
-Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-gnomekeyring-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev, libparted0-dev (>= 2.2), locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-mock (>= 0.7.0), python3-oauthlib, python3-pyicu (>= 1.0), tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
+Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-gnomekeyring-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev, libparted0-dev (>= 2.2), locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-mock (>= 0.7.0), python3-oauthlib, python3-pyicu (>= 1.0), tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
 Standards-Version: 3.9.4
 X-Python3-Version: >= 3.1
 XS-Testsuite: autopkgtest

=== modified file 'src/panel/Makefile.am'
--- src/panel/Makefile.am	2012-02-12 02:41:56 +0000
+++ src/panel/Makefile.am	2013-07-29 17:32:28 +0000
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(PANEL_CFLAGS)
+AM_CPPFLAGS = $(PANEL_CFLAGS) -DINDICATOR_DIR=\"${INDICATOR_DIR}\"
 AM_LDFLAGS = $(PANEL_LIBS)
 
 pkglibexec_PROGRAMS = panel

=== modified file 'src/panel/panel.c'
--- src/panel/panel.c	2013-02-20 23:36:48 +0000
+++ src/panel/panel.c	2013-07-29 17:32:28 +0000
@@ -29,21 +29,11 @@
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <libindicator/indicator-object.h>
+#include <libindicator/indicator-ng.h>
+#include <libido/libido.h>
 
 #define ENTRY_DATA_NAME "indicator-custom-entry-data"
 
-
-static gchar * indicator_order[] = {
-  "indicator-session-devices",
-  "indicator-sound",
-  "nm-applet",
-  "bluetooth-manager",
-  "ubiquity",
-  "keyboard",
-  NULL
-};
-
 enum {
 	STRUT_LEFT = 0,
 	STRUT_RIGHT = 1,
@@ -108,13 +98,41 @@
   gdk_error_trap_pop_ignored ();
 }
 
+/* like gtk_menu_shell_insert, but appends/prepends if @position is out
+ * of range */
+static void
+menu_shell_insert (GtkMenuShell *shell,
+                   GtkWidget    *item,
+                   gint          position)
+{
+    if (position <= 0) {
+        gtk_menu_shell_prepend (shell, item);
+    }
+    else {
+        GList *children = gtk_container_get_children (GTK_CONTAINER (shell));
+        if (children) {
+            if (position < g_list_length (children))
+                gtk_menu_shell_insert (shell, item, position);
+            else
+                gtk_menu_shell_append (shell, item);
+            g_list_free (children);
+        }
+        else
+            gtk_menu_shell_prepend (shell, item);
+    }
+}
+
 /* Stolen from indicator-loader.c in unity. */
 static void
 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data)
 {
+    GtkMenuShell *menubar = user_data;
+
     g_debug("Signal: Entry Added");
 
     GtkWidget * menuitem = gtk_menu_item_new();
+    g_object_set_data_full (G_OBJECT (menuitem), "indicator object", g_object_ref (io), g_object_unref);
+
     GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
 
     if (entry->image != NULL) {
@@ -127,23 +145,24 @@
         gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
     }
 
-    if (entry->name_hint != NULL) {
-        int i;
-        int found = 0;
-        for (i = 0; indicator_order[i] != NULL; i++) {
-            if (g_strcmp0(entry->name_hint, indicator_order[i]) == 0) {
-                gtk_menu_shell_insert(GTK_MENU_SHELL(user_data), menuitem, i);
-                found = 1;
-                break;
+    gint position = indicator_object_get_position (io);
+    gint i = -1;
+
+    if (position > 0) {
+        i = 0;
+        GList *items = gtk_container_get_children (GTK_CONTAINER (menubar));
+        if (items) {
+            GList *it;
+            for (it = items; it != NULL; it = it->next, i++) {
+                IndicatorObject *item_io = g_object_get_data (it->data, "indicator object");
+                gint item_position = indicator_object_get_position (item_io);
+                if (position > item_position)
+                    break;
             }
-        }
-        if (found == 0) {
-            gtk_menu_shell_append(GTK_MENU_SHELL(user_data), menuitem);
-        }
-    }
-    else {
-        gtk_menu_shell_append(GTK_MENU_SHELL(user_data), menuitem);
-    }
+            g_list_free (items);
+        }
+    }
+    menu_shell_insert (menubar, menuitem, i);
 
     gtk_widget_show(menuitem);
 
@@ -176,19 +195,9 @@
 }
 
 static gboolean
-load_module (const gchar * name, GtkWidget * menu)
+load_indicator (IndicatorObject *io, GtkWidget * menu)
 {
-    g_debug("Looking at Module: %s", name);
-    g_return_val_if_fail(name != NULL, FALSE);
-
-    if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) {
-        return FALSE;
-    }
-
-    g_debug("Loading Module: %s", name);
-
-    /* Build the object for the module */
-    IndicatorObject * io = indicator_object_new_from_file(name);
+    g_return_val_if_fail(io != NULL, FALSE);
 
     /* Connect to its signals */
     g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menu);
@@ -207,6 +216,36 @@
     return TRUE;
 }
 
+static void
+load_indicator_files (const gchar *directory, GtkWidget *menu)
+{
+	GDir *dir;
+	GError *error = NULL;
+	const gchar *name;
+	
+	dir = g_dir_open (INDICATOR_DIR, 0, &error);
+	if (dir == NULL) {
+		g_warning ("unable to open indicator directory: %s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	while ((name = g_dir_read_name (dir))) {
+		gchar *path = g_build_filename (directory, name, NULL);
+		IndicatorNg *io = indicator_ng_new_for_profile (path, "ubiquity", &error);
+		if (io) {
+			load_indicator (INDICATOR_OBJECT (io), menu);
+		}
+		else {
+			g_warning ("unable to load indicator '%s': %s", name, error->message);
+			g_clear_error (&error);
+		}
+		g_free (path);
+	}
+
+	g_dir_close (dir);
+}
+
 /* At some point subclass GtkWindow instead. */
 static void
 on_realize(GtkWidget *win, gpointer data) {
@@ -230,13 +269,6 @@
 	on_realize(win, NULL);
 }
 
-static const char* indicators[] = {
-	"/usr/lib/indicators3/7/libsession.so",
-	"/usr/lib/indicators3/7/libapplication.so",
-	"/usr/lib/indicators3/7/libsoundmenu.so",
-	NULL
-};
-
 static void
 draw_child (GtkWidget *child, gpointer client_data) {
 	struct {
@@ -280,10 +312,12 @@
 	GtkWidget *win;
 	GtkCssProvider *cssprovider;
 	GdkScreen *screen;
+	GError *error;
 
 	/* Disable global menus */
 	g_unsetenv ("UBUNTU_MENUPROXY");
 	gtk_init(&argc, &argv);
+	ido_init ();
 	screen = gdk_screen_get_default();
 	win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	g_signal_connect(win, "realize", G_CALLBACK(on_realize), NULL);
@@ -299,22 +333,17 @@
 			"GtkWidget {\n"
 			"    -GtkWidget-focus-line-width: 0;\n"
 			"    -GtkWidget-focus-padding: 0;\n"
-			"}\n"
-			".menuitem {\n"
-			"    padding: 0px 0px 0px 0px;\n"
 			"}\n", -1, NULL);
 
 	gtk_style_context_add_provider_for_screen(screen,
 		GTK_STYLE_PROVIDER (cssprovider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
 	GtkWidget* menubar = gtk_menu_bar_new();
-	gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar), GTK_PACK_DIRECTION_RTL);
-	int i;
-	for(i = 0; indicators[i]; i++) {
-		if (!load_module(indicators[i], menubar)) {
-			g_error("Unable to load module");
-		}
-	}
+
+	load_indicator_files (INDICATOR_DIR, menubar);
+	IndicatorObject * io = indicator_object_new_from_file("/usr/lib/indicators3/7/libapplication.so");
+	load_indicator(io, menubar);
+
 	GtkWidget* hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
 	gtk_container_add(GTK_CONTAINER(win), hbox);
 	gtk_box_pack_end(GTK_BOX(hbox), menubar, FALSE, FALSE, 0);