From 18ecafbab727d3ccb42254f03db6cff6f6a76850 Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Mon, 20 Jun 2016 15:11:23 +0300
Subject: GTK+3: add support for new style indicators

they don't have .so files anymore, only the service binary,
and they're loaded from /usr/share/unity/indicators

they're supported only with libindicator3 >= 12.10

also this adds build-dep on libido (hmm, what Freud would say?)
---
 configure.ac      | 14 ++++++++-
 src/applet-main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index f6e139e..3734df0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,16 +46,28 @@ case "$with_gtk" in
 esac
 
 INDICATOR_REQUIRED_VERSION=0.3.90
+INDICATOR_NG_VERSION=12.10
 INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
 
 PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
                           x11
                           libmatepanelapplet-4.0
                           )
+
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 
-PKG_CHECK_MODULES(INDICATOR, $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION)
+PKG_CHECK_EXISTS($INDICATOR_PKG >= $INDICATOR_NG_VERSION,
+                 [have_indicator_ng="yes"],
+                 [have_indicator_ng="no"])
+
+if test "x$with_gtk" = "x3.0" && test "x$have_indicator_ng" = "xyes"; then
+    PKG_CHECK_MODULES(INDICATOR, $INDICATOR_PKG >= $INDICATOR_NG_VERSION
+                      libido3-0.1 >= 13.10,
+                      [AC_DEFINE(HAVE_INDICATOR_NG, 1, "New style indicators support")])
+else
+    PKG_CHECK_MODULES(INDICATOR, $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION)
+fi
 
 AC_SUBST(INDICATOR_CFLAGS)
 AC_SUBST(INDICATOR_LIBS)
diff --git a/src/applet-main.c b/src/applet-main.c
index 3c0cc60..022a393 100644
--- a/src/applet-main.c
+++ b/src/applet-main.c
@@ -28,7 +28,14 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "libindicator/indicator-object.h"
+#include <libindicator/indicator-object.h>
+
+/* For new style indicators */
+#if HAVE_INDICATOR_NG
+#include <libido/libido.h>
+#include <libindicator/indicator-ng.h>
+#endif
+
 #include "tomboykeybinder.h"
 
 static gchar * indicator_order[] = {
@@ -517,7 +524,16 @@ load_indicator (GtkWidget * menubar, IndicatorObject *io, const gchar *name)
 	indicator_object_set_environment(io, (const GStrv)indicator_env);
 
 	/* Attach the 'name' to the object */
-	g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(name2order(name)));
+#if HAVE_INDICATOR_NG
+	int pos = 5000 - indicator_object_get_position(io);
+	if (pos > 5000) {
+		pos = name2order(name);
+	}
+#else
+	int pos = name2order(name);
+#endif
+
+	g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(pos));
 
 	/* Connect to its signals */
 	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menubar);
@@ -591,12 +607,74 @@ load_modules (GtkWidget *menubar, gint *indicators_loaded)
 			}
 		}
 
-		*indicators_loaded = count;
+		*indicators_loaded += count;
 
 		g_dir_close (dir);
 	}
 }
 
+#if HAVE_INDICATOR_NG
+
+#define INDICATOR_SERVICE_DIR "/usr/share/unity/indicators"
+
+static void
+load_indicators_from_indicator_files (GtkWidget *menubar, gint *indicators_loaded)
+{
+	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;
+	}
+
+	gint count = 0;
+	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);
+		g_free (filename);
+
+#ifdef INDICATOR_APPLET_APPMENU
+		if (g_strcmp0(name, "com.canonical.indicator.appmenu")) {
+			continue;
+		}
+#else
+		if (!g_strcmp0(name, "com.canonical.indicator.appmenu")) {
+			continue;
+		}
+#endif
+#ifdef INDICATOR_APPLET
+		if (!g_strcmp0(name, "com.canonical.indicator.me")) {
+			continue;
+		}
+		if (!g_strcmp0(name, "com.canonical.indicator.datetime")) {
+			continue;
+		}
+#endif
+
+		if (indicator) {
+			load_indicator(menubar, INDICATOR_OBJECT (indicator), name);
+			count++;
+		}else{
+			g_warning ("unable to load '%s': %s", name, error->message);
+			g_clear_error (&error);
+		}
+	}
+
+	*indicators_loaded += count;
+
+	g_dir_close (dir);
+}
+#endif  /* HAVE_INDICATOR_NG */
+
 static void
 hotkey_filter (char * keystring G_GNUC_UNUSED, gpointer data)
 {
@@ -844,6 +922,10 @@ static gboolean
 applet_fill_cb (MatePanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
                 gpointer data G_GNUC_UNUSED)
 {
+#if HAVE_INDICATOR_NG
+	ido_init();
+#endif
+
 	static const GtkActionEntry menu_actions[] = {
 		{"About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK(about_cb)}
 	};
@@ -951,6 +1033,9 @@ applet_fill_cb (MatePanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
 	tomboy_keybinder_bind(hotkey_keycode, hotkey_filter, menubar);
 
 	load_modules(menubar, &indicators_loaded);
+#if HAVE_INDICATOR_NG
+	load_indicators_from_indicator_files(menubar, &indicators_loaded);
+#endif
 
 	if (indicators_loaded == 0) {
 		/* A label to allow for click through */
-- 
cgit v1.2.1