Merge lp:~xnox/ubuntu/raring/liferea/messaging-menu into lp:~xnox/ubuntu/raring/liferea/original

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

Seems to work, but have no idea if this is roughly correct or not.
Also package branches are out of date, hence this crazy merge-proposal, if it looks ok I'll just upload it into raring.

[Dimitri John Ledkov (xnox)]

https://bazaar.launchpad.net/~xnox/ubuntu/raring/liferea/messaging-menu/revision/2#src/ui/ui_indicator.c

"the meat portion of this mess" =)

[lp:~xnox/ubuntu/raring/liferea/messaging-menu]

3. By Dimitri John Ledkov on 2013-03-25

use correct sprintf

[Lars Karlitski (larsu)]

It is roughly correct, but only very roughly ;)

You don't get a callback when the user clicks the application name any more. Instead, the app is launched again through its desktop file. This means that all applications that support the messaging menu must be single instance (which liferea is). Thus, on_indicator_server_clicked can be removed.

I recommend against hooking on_indicator_clicked up to the detailed signals only to pass the node as user data (if you're doing it like that, you would also need to disconnect the signals in the handler). Instead, hook the function up once, and lookup the node through its id in on_indicator_clicked.

The arguments to on_indicator_clicked are wrong, they should be

  static void
  on_indicator_clicked (MessagingMenuApp *mmapp, const gchar *source_id, gpointer user_data)

What did you intend to do here:

  messaging_menu_app_remove_source (indicator_priv->server, (char *)(indicator));

Casting the MessagingMenuApp pointer to a string?! You probably want 'source_id' in there.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

> It is roughly correct, but only very roughly ;)
>
> You don't get a callback when the user clicks the application name any more.
> Instead, the app is launched again through its desktop file. This means that
> all applications that support the messaging menu must be single instance
> (which liferea is). Thus, on_indicator_server_clicked can be removed.
>

Dead code -> gone! thanks.

> I recommend against hooking on_indicator_clicked up to the detailed signals
> only to pass the node as user data (if you're doing it like that, you would
> also need to disconnect the signals in the handler). Instead, hook the
> function up once, and lookup the node through its id in on_indicator_clicked.
>

I see, makes sense. Will switch to using one handler to rule them all.

> The arguments to on_indicator_clicked are wrong, they should be
>
> static void
> on_indicator_clicked (MessagingMenuApp *mmapp, const gchar *source_id,
> gpointer user_data)
>

Missing const added.

> What did you intend to do here:
>
> messaging_menu_app_remove_source (indicator_priv->server, (char
> *)(indicator));
>
> Casting the MessagingMenuApp pointer to a string?! You probably want
> 'source_id' in there.

I can see how the terminology is confusing. So there is indicator_priv which has a GPtrArray of node->id's. Confusingly that GPtrArray is called "indicators" and the pointers to node->id's are "indicator", thus it actually is casting 'source_id' from a gpointer to char.

Does messaging menu "rate-limit" at the moment? Cause that indicator_priv is mostly to keep track of how many source_ids are displayed (no more than 6 at the moment)

Unmerged revisions

3. By Dimitri John Ledkov on 2013-03-25

use correct sprintf

2. By Dimitri John Ledkov on 2013-03-25

Port to messaging-menu. (LP: #1040259)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-03-25 02:10:13 +0000
+++ .pc/applied-patches	2013-03-25 03:54:20 +0000
@@ -5,3 +5,4 @@
 add_X-Ubuntu-Gettext-Domain
 libunity.patch
 port-to-libindicate-0.7.patch
+port-to-messaging-menu.patch

=== added directory '.pc/port-to-messaging-menu.patch'
=== added file '.pc/port-to-messaging-menu.patch/configure.ac'
--- .pc/port-to-messaging-menu.patch/configure.ac	1970-01-01 00:00:00 +0000
+++ .pc/port-to-messaging-menu.patch/configure.ac	2013-03-25 03:54:20 +0000
@@ -0,0 +1,181 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT([liferea],[1.8.10],[[e-mail]])
+AC_CANONICAL_HOST
+AC_CONFIG_SRCDIR([src/feedlist.c])
+
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([1.11 foreign std-options -Wall -Werror])
+AM_SILENT_RULES([yes])
+
+dnl Needed for automake 1.12
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
+AC_PREREQ(2.59)
+
+LT_INIT
+IT_PROG_INTLTOOL([0.35.0])
+
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_HEADER_STDC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_SYS_LARGEFILE
+
+AC_ARG_ENABLE(sm,        AS_HELP_STRING([--disable-sm],[compile without X session management support]),,enable_sm=yes)
+AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes)
+AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes)
+AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes)
+
+AC_CHECK_FUNCS([strsep])
+
+PKG_PROG_PKG_CONFIG()
+
+dnl #######################################################################
+dnl # Check for X session management libs
+dnl #######################################################################
+
+if test "x$enable_sm" = "xyes"; then
+  PKG_CHECK_MODULES([SM], [sm ice], [AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.])],[enable_sm=no])
+fi
+
+dnl *********
+dnl libnotify
+dnl *********
+
+if test "x$enable_libnotify" = "xyes"; then
+  PKG_CHECK_MODULES([LIBNOTIFY], libnotify >= 0.7,enable_libnotify=yes,enable_libnotify=no)
+  if test "x$enable_libnotify" = "xyes"; then
+    AC_DEFINE(HAVE_LIBNOTIFY, 4, [Define if libnotify.so.4 support is enabled])
+  fi
+  if test "x$enable_libnotify" = "xno"; then
+    PKG_CHECK_MODULES([LIBNOTIFY], libnotify >= 0.3.2,enable_libnotify=yes,enable_libnotify=no)
+    if test "x$enable_libnotify" = "xyes"; then
+      AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify.so.1 support is enabled])
+    fi
+  fi
+  AC_SUBST(LIBNOTIFY_CFLAGS)
+  AC_SUBST(LIBNOTIFY_LIBS)
+else
+  enable_libnotify=no
+fi
+
+AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes")
+
+dnl *********
+dnl libindicate
+dnl *********
+
+if test "x$enable_libindicate" = "xyes"; then
+   PKG_CHECK_MODULES([LIBINDICATE], indicate-0.7 indicate-gtk-0.7,enable_libindicate=yes,enable_libindicate=no)
+   AC_SUBST(LIBINDICATE_CFLAGS)
+   AC_SUBST(LIBINDICATE_LIBS)
+else
+   enable_libindicate=no
+fi
+
+if test "x$enable_libindicate" = "xyes"; then
+  AC_DEFINE(HAVE_LIBINDICATE, 1, [Define if libindicate support is enabled])
+fi
+
+AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes")
+
+dnl *********
+dnl libunity
+dnl *********
+
+if test "x$enable_libunity" = "xyes"; then
+   PKG_CHECK_MODULES([LIBUNITY], unity >= 3.4.2,enable_libunity=yes,enable_libunity=no)
+   AC_SUBST(LIBUNITY_CFLAGS)
+   AC_SUBST(LIBUNITY_LIBS)
+else
+   enable_libunity=no
+fi
+
+if test "x$enable_libunity" = "xyes"; then
+  AC_DEFINE(HAVE_LIBUNITY, 1, [Define if libunity support is enabled])
+fi
+
+AM_CONDITIONAL(WITH_LIBUNITY, test "x$enable_libunity" = "xyes")
+
+dnl Checking for gconftool-2
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+
+if test "x$GCONFTOOL" = xno; then
+        AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+fi
+
+AM_GCONF_SOURCE_2
+
+pkg_modules="	gtk+-2.0 >= 2.18.0
+		glib-2.0 >= 2.24.0
+		gio-2.0 >= 2.26.0
+		pango >= 1.4.0
+		gconf-2.0 >= 1.1.9 
+		libxml-2.0 >= 2.6.27
+		libxslt >= 1.1.19
+		sqlite3 >= 3.7.0
+		gmodule-2.0 >= 2.0.0
+		gthread-2.0
+		libsoup-2.4 >= 2.28.2
+		unique-1.0
+		webkit-1.0 >= 1.2.2
+		json-glib-1.0"
+
+PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+
+AC_SUBST(PACKAGE_CFLAGS)
+AC_SUBST(PACKAGE_LIBS)
+
+uname=`uname`
+AC_DEFINE_UNQUOTED(OS, $uname, [defines a OS version string, used for OS specific code])
+AC_DEFINE_UNQUOTED(OSNAME, "$uname", [defines a OS version string, used for the user agent string])
+AC_MSG_RESULT(user agent OS = $uname)
+
+AM_GLIB_GNU_GETTEXT
+
+GETTEXT_PACKAGE=liferea
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])
+
+
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+src/webkit/Makefile
+src/parsers/Makefile
+src/fl_sources/Makefile
+src/notification/Makefile
+src/ui/Makefile
+doc/Makefile
+doc/html/Makefile
+xslt/Makefile
+man/Makefile
+man/pl/Makefile
+pixmaps/Makefile
+pixmaps/16x16/Makefile
+pixmaps/22x22/Makefile
+pixmaps/24x24/Makefile
+pixmaps/32x32/Makefile
+pixmaps/48x48/Makefile
+pixmaps/scalable/Makefile
+opml/Makefile
+glade/Makefile
+po/Makefile.in
+src/liferea-add-feed
+])
+AC_OUTPUT
+
+echo
+echo "$PACKAGE $VERSION"
+echo
+echo "Use X Session Management........ : $enable_sm"
+echo "Use libnotify................... : $enable_libnotify"
+echo "Use libindicate................. : $enable_libindicate"
+echo "Use libunity.................... : $enable_libunity"
+echo
+eval eval echo Liferea will be installed in $bindir.
+echo
+echo configure complete, now type \'make\'
+echo

=== added directory '.pc/port-to-messaging-menu.patch/src'
=== added file '.pc/port-to-messaging-menu.patch/src/Makefile.am'
--- .pc/port-to-messaging-menu.patch/src/Makefile.am	1970-01-01 00:00:00 +0000
+++ .pc/port-to-messaging-menu.patch/src/Makefile.am	2013-03-25 03:54:20 +0000
@@ -0,0 +1,90 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = parsers notification ui fl_sources webkit .
+
+AM_CPPFLAGS = \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+	-DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DBIN_DIR=\""$(bindir)"\" \
+	-I$(top_srcdir)/src \
+	$(PACKAGE_CFLAGS) \
+	$(SM_CFLAGS)
+
+bin_PROGRAMS = liferea
+bin_SCRIPTS = liferea-add-feed
+
+liferea_SOURCES = \
+	browser.c browser.h \
+	comments.c comments.h \
+	common.c common.h \
+	conf.c conf.h \
+	date.c date.h \
+	db.c db.h \
+	dbus.c dbus.h \
+	debug.c debug.h \
+	e-date.c e-date.h \
+	enclosure.c enclosure.h \
+	export.c export.h \
+	favicon.c favicon.h \
+	feed.c feed.h \
+	feed_parser.c feed_parser.h \
+	feedlist.c feedlist.h \
+	folder.c folder.h \
+	html.c html.h \
+	htmlview.c htmlview.h \
+	item.c item.h \
+	item_loader.c item_loader.h \
+	item_state.c item_state.h \
+	itemset.c itemset.h \
+	itemlist.c itemlist.h \
+	json.c json.h \
+	metadata.c metadata.h \
+	migrate.c migrate.h \
+	net.c net.h \
+	net_monitor.c net_monitor.h \
+	newsbin.c newsbin.h \
+	node.c node.h \
+	node_type.c node_type.h \
+	node_view.h \
+	render.c render.h \
+	rule.c rule.h \
+	social.c social.h \
+	subscription.c subscription.h \
+	subscription_type.h \
+	update.c update.h \
+	main.c \
+	vfolder.c vfolder.h \
+	vfolder_loader.c vfolder_loader.h \
+	xml.c xml.h
+
+liferea_LDADD =	parsers/libliparsers.a \
+		fl_sources/libliflsources.a \
+		ui/libliui.a \
+		webkit/libwebkit.a \
+		$(SYNC_LIB) \
+		$(PACKAGE_LIBS) $(SM_LIBS) \
+		$(INTLLIBS) $(AVAHI_LIBS) \
+		$(WEBKIT_LIBS) $(LIBNOTIFY_LIBS)
+
+EXTRA_DIST = $(srcdir)/liferea-add-feed.in
+DISTCLEANFILES = $(srcdir)/liferea-add-feed
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = liferea-add-feed
+
+if WITH_LIBNOTIFY
+
+liferea_LDADD += notification/libnotify.a $(LIBNOTIFY_LIBS)
+
+endif
+
+if WITH_LIBINDICATE
+
+liferea_LDADD += $(LIBINDICATE_LIBS)
+
+endif
+
+if WITH_LIBUNITY
+
+liferea_LDADD += $(LIBUNITY_LIBS)
+
+endif

=== added directory '.pc/port-to-messaging-menu.patch/src/ui'
=== added file '.pc/port-to-messaging-menu.patch/src/ui/Makefile.am'
--- .pc/port-to-messaging-menu.patch/src/ui/Makefile.am	1970-01-01 00:00:00 +0000
+++ .pc/port-to-messaging-menu.patch/src/ui/Makefile.am	2013-03-25 03:54:20 +0000
@@ -0,0 +1,37 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+	-DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-I$(top_srcdir)/src
+
+noinst_LIBRARIES = libliui.a
+
+libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) $(LIBUNITY_CFLAGS)
+libliui_a_SOURCES = \
+	auth_dialog.c auth_dialog.h \
+	browser_tabs.c browser_tabs.h \
+	enclosure_list_view.c enclosure_list_view.h \
+	feed_list_view.c feed_list_view.h \
+	icons.c icons.h \
+	item_list_view.c item_list_view.h \
+	itemview.c itemview.h \
+	liferea_dialog.c liferea_dialog.h \
+	liferea_htmlview.c liferea_htmlview.h \
+	liferea_shell.c liferea_shell.h \
+	popup_menu.c popup_menu.h \
+	rule_editor.c rule_editor.h \
+	search_dialog.c search_dialog.h \
+	search_folder_dialog.c search_folder_dialog.h \
+	subscription_dialog.c subscription_dialog.h \
+	ui_common.c ui_common.h \
+	ui_dnd.c ui_dnd.h \
+	ui_folder.c ui_folder.h \
+	ui_indicator.c ui_indicator.h \
+	ui_node.c ui_node.h \
+	ui_prefs.c ui_prefs.h \
+	ui_session.c ui_session.h \
+	ui_tray.c ui_tray.h \
+	ui_unity.c ui_unity.h \
+	ui_update.c ui_update.h 

=== added file '.pc/port-to-messaging-menu.patch/src/ui/ui_indicator.c'
--- .pc/port-to-messaging-menu.patch/src/ui/ui_indicator.c	1970-01-01 00:00:00 +0000
+++ .pc/port-to-messaging-menu.patch/src/ui/ui_indicator.c	2013-03-25 03:54:20 +0000
@@ -0,0 +1,236 @@
+/*
+ * @file ui_indicator.c  libindicate support
+ *
+ * Copyright (C) 2010-2011 Maia Kozheva <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
+#include "ui_indicator.h"
+
+#ifdef HAVE_LIBINDICATE
+
+#include <gtk/gtk.h>
+#include <libindicate/server.h>
+#include <libindicate/indicator.h>
+#include <libindicate-gtk/indicator.h>
+#include <libindicate/interests.h>
+#include "feedlist.h"
+#include "feed_list_view.h"
+#include "liferea_shell.h"
+#include "ui_tray.h"
+#include "vfolder.h"
+
+/* The maximum number of feeds to display in the indicator menu. */
+#define MAX_INDICATORS      6
+/* Whether Liferea should set the indicator menu to attention
+   status whenever new feed items are downloaded. Since news feeds
+   do not typically require the user's urgent attention, unlike
+   mail and IM messages, this is set to false by default. */
+#define SET_DRAW_ATTENTION  FALSE
+
+static struct indicator_priv {
+	IndicateServer *server;
+	gboolean visible;
+	GPtrArray *indicators;
+} *indicator_priv = NULL;
+
+/*
+ The desktop file to initialize the indicator menu with. Resolves to
+ a string like "/usr/share/applications/liferea.desktop".
+*/ 
+static const char *DESKTOP_FILE = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "applications" G_DIR_SEPARATOR_S "liferea.desktop";
+
+static void
+remove_all_indicators () {
+	g_ptr_array_set_size (indicator_priv->indicators, 0);
+}
+
+/*
+ Called when the main "Liferea" entry in the indicator menu is clicked.
+*/ 
+static void
+on_indicator_server_clicked (IndicateServer *server, gchar *type, gpointer user_data)
+{
+	liferea_shell_present ();
+	remove_all_indicators ();
+}
+
+/*
+ Called when the indicator container applet is shown.
+*/ 
+static void
+on_indicator_interest_added (IndicateServer *server, guint interest, gpointer user_data)
+{
+	if (interest != INDICATE_INTEREST_SERVER_SIGNAL)
+		return;
+
+	indicator_priv->visible = TRUE;
+	ui_tray_update ();
+}
+
+/*
+ Called when the indicator container applet is hidden.
+*/ 
+static void
+on_indicator_interest_removed (IndicateServer *server, guint interest, gpointer user_data)
+{
+	if (interest != INDICATE_INTEREST_SERVER_SIGNAL)
+		return;
+
+	indicator_priv->visible = FALSE;
+	ui_tray_update ();
+}
+
+/*
+ Called when the indicator menu entry for a specific feed
+ is clicked, meaning Liferea should switch to that feed.
+*/ 
+static void
+on_indicator_clicked (IndicateIndicator *indicator, guint timestamp, gpointer user_data)
+{
+	feed_list_view_select ((nodePtr) user_data);
+	liferea_shell_present ();
+	remove_all_indicators ();
+}
+
+static void
+destroy_indicator (gpointer indicator)
+{
+	if (indicator_priv->server == NULL || indicator == NULL) 
+		return;
+	
+	indicate_server_remove_indicator (indicator_priv->server, INDICATE_INDICATOR(indicator));
+	g_object_unref (G_OBJECT (indicator));
+}
+
+void
+ui_indicator_init ()
+{
+	if (indicator_priv != NULL)
+		return;
+	
+	indicator_priv = g_new0 (struct indicator_priv, 1);
+	indicator_priv->visible = FALSE;
+	indicator_priv->indicators = g_ptr_array_new_with_free_func (destroy_indicator);
+	
+	indicator_priv->server = indicate_server_ref_default();
+	indicate_server_set_type (indicator_priv->server, "message.im");
+	indicate_server_set_desktop_file (indicator_priv->server, DESKTOP_FILE);
+	
+	g_signal_connect (G_OBJECT (indicator_priv->server), "server-display", G_CALLBACK (on_indicator_server_clicked), NULL);
+	g_signal_connect (G_OBJECT (indicator_priv->server), "interest-added", G_CALLBACK (on_indicator_interest_added), NULL);
+	g_signal_connect (G_OBJECT (indicator_priv->server), "interest-removed", G_CALLBACK (on_indicator_interest_removed), NULL);
+	
+	indicate_server_show (indicator_priv->server);
+	ui_indicator_update ();
+}
+
+void
+ui_indicator_destroy ()
+{
+	if (indicator_priv == NULL)
+		return;
+	
+	remove_all_indicators ();
+	g_object_unref (indicator_priv->server);
+	indicator_priv->server = NULL;
+	g_ptr_array_free (indicator_priv->indicators, TRUE);
+	g_free (indicator_priv);
+	indicator_priv = NULL;
+}
+
+static void
+add_node_indicator (nodePtr node)
+{
+	IndicateIndicator *indicator;
+	GdkPixbuf *pixbuf;
+	gchar count[10];
+	
+	if (indicator_priv->indicators->len >= MAX_INDICATORS)
+		return;
+
+	if (IS_VFOLDER(node) || g_slist_length (node->children) > 0) {
+		/* Not a feed - walk children and do nothing more */
+		node_foreach_child (node, add_node_indicator);
+		return;
+	}
+	
+	/* Skip feeds with no unread items */
+	if (node->unreadCount == 0)
+		return;
+	
+	indicator = indicate_indicator_new_with_server (indicator_priv->server);
+	g_signal_connect (indicator, "user-display", G_CALLBACK (on_indicator_clicked), node);
+
+	/* load favicon */
+	pixbuf = gdk_pixbuf_new_from_file (node->iconFile, NULL);
+
+	/* display favicon */
+	indicate_gtk_indicator_set_property_icon (indicator, "icon", pixbuf);
+	gdk_pixbuf_unref (pixbuf);
+
+	sprintf (count, "%u", node->unreadCount);
+	indicate_indicator_set_property (indicator, "name", node->title);
+	indicate_indicator_set_property (indicator, "count", count);
+#if SET_DRAW_ATTENTION
+	indicate_indicator_set_property_bool (indicator, "draw-attention", TRUE);
+#endif
+	g_ptr_array_add (indicator_priv->indicators, indicator);
+}
+
+void
+ui_indicator_update ()
+{
+	guint index;
+
+	/* Do not update indicators if the user is interacting with the main window */
+	if (!indicator_priv || gtk_window_is_active (GTK_WINDOW (liferea_shell_get_window ())))
+		return;
+
+	/* Remove all previous indicators from the menu */
+	remove_all_indicators ();
+	/* ...then walk the tree and add an indicator for each unread feed */
+	feedlist_foreach (add_node_indicator);
+
+	/* revert order of items */
+	for (index = indicator_priv->indicators->len; index > 0; index--)
+		indicate_indicator_show (g_ptr_array_index (indicator_priv->indicators, index - 1));	
+}
+
+gboolean
+ui_indicator_is_visible ()
+{
+	return indicator_priv && indicator_priv->visible;
+}
+
+#else
+
+/*
+ If Liferea is compiled without libindicate support, all indicator
+ support functions do nothing. The application behaves as if there
+ is no indicator applet present.
+*/
+
+void ui_indicator_init () {}
+void ui_indicator_destroy () {}
+void ui_indicator_update () {}
+gboolean ui_indicator_is_visible () { return FALSE; }
+
+#endif  /* HAVE_LIBINDICATE */

=== modified file 'configure.ac'
--- configure.ac	2013-03-25 02:10:13 +0000
+++ configure.ac	2013-03-25 03:54:20 +0000
@@ -25,7 +25,7 @@
 
 AC_ARG_ENABLE(sm,        AS_HELP_STRING([--disable-sm],[compile without X session management support]),,enable_sm=yes)
 AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes)
-AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes)
+AC_ARG_ENABLE(messaging-menu, AS_HELP_STRING([--disable-messaging-menu],[compile without messaging-menu support]),,enable_messaging_menu=yes)
 AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes)
 
 AC_CHECK_FUNCS([strsep])
@@ -64,22 +64,22 @@
 AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes")
 
 dnl *********
-dnl libindicate
+dnl messaging-menu
 dnl *********
 
-if test "x$enable_libindicate" = "xyes"; then
-   PKG_CHECK_MODULES([LIBINDICATE], indicate-0.7 indicate-gtk-0.7,enable_libindicate=yes,enable_libindicate=no)
-   AC_SUBST(LIBINDICATE_CFLAGS)
-   AC_SUBST(LIBINDICATE_LIBS)
+if test "x$enable_messaging_menu" = "xyes"; then
+   PKG_CHECK_MODULES([MESSAGING_MENU], messaging-menu,enable_messaging_menu=yes,enable_messaging_menu=no)
+   AC_SUBST(MESSAGING_MENU_CFLAGS)
+   AC_SUBST(MESSAGING_MENU_LIBS)
 else
-   enable_libindicate=no
-fi
-
-if test "x$enable_libindicate" = "xyes"; then
-  AC_DEFINE(HAVE_LIBINDICATE, 1, [Define if libindicate support is enabled])
-fi
-
-AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes")
+   enable_messaging_menu=no
+fi
+
+if test "x$enable_messaging_menu" = "xyes"; then
+  AC_DEFINE(HAVE_MESSAGING_MENU, 1, [Define if messaging-menu support is enabled])
+fi
+
+AM_CONDITIONAL(WITH_MESSAGING_MENU, test "x$enable_messaging_menu" = "xyes")
 
 dnl *********
 dnl libunity
@@ -172,7 +172,7 @@
 echo
 echo "Use X Session Management........ : $enable_sm"
 echo "Use libnotify................... : $enable_libnotify"
-echo "Use libindicate................. : $enable_libindicate"
+echo "Use messaging-menu.............. : $enable_messaging_menu"
 echo "Use libunity.................... : $enable_libunity"
 echo
 eval eval echo Liferea will be installed in $bindir.

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-25 02:10:13 +0000
+++ debian/changelog	2013-03-25 03:54:20 +0000
@@ -1,3 +1,9 @@
+liferea (1.8.10-0ubuntu2) UNRELEASED; urgency=low
+
+  * Port to messaging-menu. (LP: #1040259)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Mon, 25 Mar 2013 02:41:34 +0000
+
 liferea (1.8.10-0ubuntu1) raring; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2013-03-25 02:10:13 +0000
+++ debian/control	2013-03-25 03:54:20 +0000
@@ -21,8 +21,7 @@
                intltool,
                libicu-dev,
                libx11-dev,
-               libindicate-dev (>= 0.6.90),
-               libindicate-gtk-dev (>= 0.6.90),
+	       libmessaging-menu-dev,
                dh-autoreconf,
                libunity-dev (>= 5.0.0),
                libice-dev,

=== added file 'debian/patches/port-to-messaging-menu.patch'
--- debian/patches/port-to-messaging-menu.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/port-to-messaging-menu.patch	2013-03-25 03:54:20 +0000
@@ -0,0 +1,289 @@
+Description: port to messaging menu
+Author: Dmitrijs Ledkovs <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1040259
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,7 +25,7 @@
+ 
+ AC_ARG_ENABLE(sm,        AS_HELP_STRING([--disable-sm],[compile without X session management support]),,enable_sm=yes)
+ AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes)
+-AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes)
++AC_ARG_ENABLE(messaging-menu, AS_HELP_STRING([--disable-messaging-menu],[compile without messaging-menu support]),,enable_messaging_menu=yes)
+ AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes)
+ 
+ AC_CHECK_FUNCS([strsep])
+@@ -64,22 +64,22 @@
+ AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes")
+ 
+ dnl *********
+-dnl libindicate
++dnl messaging-menu
+ dnl *********
+ 
+-if test "x$enable_libindicate" = "xyes"; then
+-   PKG_CHECK_MODULES([LIBINDICATE], indicate-0.7 indicate-gtk-0.7,enable_libindicate=yes,enable_libindicate=no)
+-   AC_SUBST(LIBINDICATE_CFLAGS)
+-   AC_SUBST(LIBINDICATE_LIBS)
++if test "x$enable_messaging_menu" = "xyes"; then
++   PKG_CHECK_MODULES([MESSAGING_MENU], messaging-menu,enable_messaging_menu=yes,enable_messaging_menu=no)
++   AC_SUBST(MESSAGING_MENU_CFLAGS)
++   AC_SUBST(MESSAGING_MENU_LIBS)
+ else
+-   enable_libindicate=no
++   enable_messaging_menu=no
+ fi
+ 
+-if test "x$enable_libindicate" = "xyes"; then
+-  AC_DEFINE(HAVE_LIBINDICATE, 1, [Define if libindicate support is enabled])
++if test "x$enable_messaging_menu" = "xyes"; then
++  AC_DEFINE(HAVE_MESSAGING_MENU, 1, [Define if messaging-menu support is enabled])
+ fi
+ 
+-AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes")
++AM_CONDITIONAL(WITH_MESSAGING_MENU, test "x$enable_messaging_menu" = "xyes")
+ 
+ dnl *********
+ dnl libunity
+@@ -172,7 +172,7 @@
+ echo
+ echo "Use X Session Management........ : $enable_sm"
+ echo "Use libnotify................... : $enable_libnotify"
+-echo "Use libindicate................. : $enable_libindicate"
++echo "Use messaging-menu.............. : $enable_messaging_menu"
+ echo "Use libunity.................... : $enable_libunity"
+ echo
+ eval eval echo Liferea will be installed in $bindir.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -77,9 +77,9 @@
+ 
+ endif
+ 
+-if WITH_LIBINDICATE
++if WITH_MESSAGING_MENU
+ 
+-liferea_LDADD += $(LIBINDICATE_LIBS)
++liferea_LDADD += $(MESSAGING_MENU_LIBS)
+ 
+ endif
+ 
+--- a/src/ui/Makefile.am
++++ b/src/ui/Makefile.am
+@@ -8,7 +8,7 @@
+ 
+ noinst_LIBRARIES = libliui.a
+ 
+-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) $(LIBUNITY_CFLAGS)
++libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(MESSAGING_MENU_CFLAGS) $(LIBUNITY_CFLAGS)
+ libliui_a_SOURCES = \
+ 	auth_dialog.c auth_dialog.h \
+ 	browser_tabs.c browser_tabs.h \
+--- a/src/ui/ui_indicator.c
++++ b/src/ui/ui_indicator.c
+@@ -24,13 +24,10 @@
+ 
+ #include "ui_indicator.h"
+ 
+-#ifdef HAVE_LIBINDICATE
++#ifdef HAVE_MESSAGING_MENU
+ 
+ #include <gtk/gtk.h>
+-#include <libindicate/server.h>
+-#include <libindicate/indicator.h>
+-#include <libindicate-gtk/indicator.h>
+-#include <libindicate/interests.h>
++#include <messaging-menu.h>
+ #include "feedlist.h"
+ #include "feed_list_view.h"
+ #include "liferea_shell.h"
+@@ -39,15 +36,9 @@
+ 
+ /* The maximum number of feeds to display in the indicator menu. */
+ #define MAX_INDICATORS      6
+-/* Whether Liferea should set the indicator menu to attention
+-   status whenever new feed items are downloaded. Since news feeds
+-   do not typically require the user's urgent attention, unlike
+-   mail and IM messages, this is set to false by default. */
+-#define SET_DRAW_ATTENTION  FALSE
+ 
+ static struct indicator_priv {
+-	IndicateServer *server;
+-	gboolean visible;
++	MessagingMenuApp *server;
+ 	GPtrArray *indicators;
+ } *indicator_priv = NULL;
+ 
+@@ -55,7 +46,7 @@
+  The desktop file to initialize the indicator menu with. Resolves to
+  a string like "/usr/share/applications/liferea.desktop".
+ */ 
+-static const char *DESKTOP_FILE = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "applications" G_DIR_SEPARATOR_S "liferea.desktop";
++static const char *DESKTOP_FILE = "liferea.desktop";
+ 
+ static void
+ remove_all_indicators () {
+@@ -66,44 +57,18 @@
+  Called when the main "Liferea" entry in the indicator menu is clicked.
+ */ 
+ static void
+-on_indicator_server_clicked (IndicateServer *server, gchar *type, gpointer user_data)
++on_indicator_server_clicked (MessagingMenuApp *server, gchar *source_id, gpointer user_data)
+ {
+ 	liferea_shell_present ();
+ 	remove_all_indicators ();
+ }
+ 
+ /*
+- Called when the indicator container applet is shown.
+-*/ 
+-static void
+-on_indicator_interest_added (IndicateServer *server, guint interest, gpointer user_data)
+-{
+-	if (interest != INDICATE_INTEREST_SERVER_SIGNAL)
+-		return;
+-
+-	indicator_priv->visible = TRUE;
+-	ui_tray_update ();
+-}
+-
+-/*
+- Called when the indicator container applet is hidden.
+-*/ 
+-static void
+-on_indicator_interest_removed (IndicateServer *server, guint interest, gpointer user_data)
+-{
+-	if (interest != INDICATE_INTEREST_SERVER_SIGNAL)
+-		return;
+-
+-	indicator_priv->visible = FALSE;
+-	ui_tray_update ();
+-}
+-
+-/*
+  Called when the indicator menu entry for a specific feed
+  is clicked, meaning Liferea should switch to that feed.
+ */ 
+ static void
+-on_indicator_clicked (IndicateIndicator *indicator, guint timestamp, gpointer user_data)
++on_indicator_clicked (MessagingMenuApp *indicator, gchar *source_id, gpointer user_data)
+ {
+ 	feed_list_view_select ((nodePtr) user_data);
+ 	liferea_shell_present ();
+@@ -116,8 +81,7 @@
+ 	if (indicator_priv->server == NULL || indicator == NULL) 
+ 		return;
+ 	
+-	indicate_server_remove_indicator (indicator_priv->server, INDICATE_INDICATOR(indicator));
+-	g_object_unref (G_OBJECT (indicator));
++	messaging_menu_app_remove_source (indicator_priv->server, (char *)(indicator));
+ }
+ 
+ void
+@@ -127,18 +91,13 @@
+ 		return;
+ 	
+ 	indicator_priv = g_new0 (struct indicator_priv, 1);
+-	indicator_priv->visible = FALSE;
+ 	indicator_priv->indicators = g_ptr_array_new_with_free_func (destroy_indicator);
+ 	
+-	indicator_priv->server = indicate_server_ref_default();
+-	indicate_server_set_type (indicator_priv->server, "message.im");
+-	indicate_server_set_desktop_file (indicator_priv->server, DESKTOP_FILE);
+-	
+-	g_signal_connect (G_OBJECT (indicator_priv->server), "server-display", G_CALLBACK (on_indicator_server_clicked), NULL);
+-	g_signal_connect (G_OBJECT (indicator_priv->server), "interest-added", G_CALLBACK (on_indicator_interest_added), NULL);
+-	g_signal_connect (G_OBJECT (indicator_priv->server), "interest-removed", G_CALLBACK (on_indicator_interest_removed), NULL);
++	indicator_priv->server = messaging_menu_app_new (DESKTOP_FILE);
++	messaging_menu_app_register (indicator_priv->server);
++
++	g_signal_connect (G_OBJECT (indicator_priv->server), "activate-source", G_CALLBACK (on_indicator_server_clicked), NULL);
+ 	
+-	indicate_server_show (indicator_priv->server);
+ 	ui_indicator_update ();
+ }
+ 
+@@ -159,9 +118,10 @@
+ static void
+ add_node_indicator (nodePtr node)
+ {
+-	IndicateIndicator *indicator;
+-	GdkPixbuf *pixbuf;
++	GFile *file;
++	GIcon *icon;
+ 	gchar count[10];
++	gchar *signal;
+ 	
+ 	if (indicator_priv->indicators->len >= MAX_INDICATORS)
+ 		return;
+@@ -176,30 +136,28 @@
+ 	if (node->unreadCount == 0)
+ 		return;
+ 	
+-	indicator = indicate_indicator_new_with_server (indicator_priv->server);
+-	g_signal_connect (indicator, "user-display", G_CALLBACK (on_indicator_clicked), node);
+-
+-	/* load favicon */
+-	pixbuf = gdk_pixbuf_new_from_file (node->iconFile, NULL);
++	file = g_file_new_for_path (node->iconFile);
++	icon = g_file_icon_new (file);
+ 
+-	/* display favicon */
+-	indicate_gtk_indicator_set_property_icon (indicator, "icon", pixbuf);
+-	gdk_pixbuf_unref (pixbuf);
+-
+-	sprintf (count, "%u", node->unreadCount);
+-	indicate_indicator_set_property (indicator, "name", node->title);
+-	indicate_indicator_set_property (indicator, "count", count);
+-#if SET_DRAW_ATTENTION
+-	indicate_indicator_set_property_bool (indicator, "draw-attention", TRUE);
+-#endif
+-	g_ptr_array_add (indicator_priv->indicators, indicator);
++	messaging_menu_app_append_source_with_count(
++		indicator_priv->server,
++		node->id,
++		icon,
++		node->title,
++		node->unreadCount);
++
++	signal = g_strdup_printf("activate-source::%s", node->id);
++	g_signal_connect (indicator_priv->server, signal, G_CALLBACK (on_indicator_clicked), node);
++	g_ptr_array_add (indicator_priv->indicators, node->id);
++
++	g_object_unref(icon);
++	g_object_unref(file);
++	g_free(signal);
+ }
+ 
+ void
+ ui_indicator_update ()
+ {
+-	guint index;
+-
+ 	/* Do not update indicators if the user is interacting with the main window */
+ 	if (!indicator_priv || gtk_window_is_active (GTK_WINDOW (liferea_shell_get_window ())))
+ 		return;
+@@ -208,16 +166,12 @@
+ 	remove_all_indicators ();
+ 	/* ...then walk the tree and add an indicator for each unread feed */
+ 	feedlist_foreach (add_node_indicator);
+-
+-	/* revert order of items */
+-	for (index = indicator_priv->indicators->len; index > 0; index--)
+-		indicate_indicator_show (g_ptr_array_index (indicator_priv->indicators, index - 1));	
+ }
+ 
+ gboolean
+ ui_indicator_is_visible ()
+ {
+-	return indicator_priv && indicator_priv->visible;
++	return TRUE;
+ }
+ 
+ #else
+@@ -233,4 +187,4 @@
+ void ui_indicator_update () {}
+ gboolean ui_indicator_is_visible () { return FALSE; }
+ 
+-#endif  /* HAVE_LIBINDICATE */
++#endif  /* HAVE_MESSAGING_MENU */

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-25 02:10:13 +0000
+++ debian/patches/series	2013-03-25 03:54:20 +0000
@@ -5,3 +5,4 @@
 add_X-Ubuntu-Gettext-Domain
 libunity.patch
 port-to-libindicate-0.7.patch
+port-to-messaging-menu.patch

=== modified file 'debian/rules'
--- debian/rules	2013-03-25 02:10:13 +0000
+++ debian/rules	2013-03-25 03:54:20 +0000
@@ -48,7 +48,7 @@
 	 ./configure $(SYSTEM) --prefix=/usr \
 	 --mandir=\$${prefix}/share/man --sysconfdir=/etc \
 	 --enable-sm --enable-gnutls --enable-lua --enable-libnotify \
-	 --enable-libindicate \
+	 --enable-messaging-menu \
 	 $(ENABLE_NM)
 	ln -s $(CURDIR)/man/liferea.1 $(CURDIR)/debian/liferea-add-feed.1
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-03-25 02:10:13 +0000
+++ src/Makefile.am	2013-03-25 03:54:20 +0000
@@ -77,9 +77,9 @@
 
 endif
 
-if WITH_LIBINDICATE
+if WITH_MESSAGING_MENU
 
-liferea_LDADD += $(LIBINDICATE_LIBS)
+liferea_LDADD += $(MESSAGING_MENU_LIBS)
 
 endif
 

=== modified file 'src/ui/Makefile.am'
--- src/ui/Makefile.am	2013-03-25 02:10:13 +0000
+++ src/ui/Makefile.am	2013-03-25 03:54:20 +0000
@@ -8,7 +8,7 @@
 
 noinst_LIBRARIES = libliui.a
 
-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) $(LIBUNITY_CFLAGS)
+libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(MESSAGING_MENU_CFLAGS) $(LIBUNITY_CFLAGS)
 libliui_a_SOURCES = \
 	auth_dialog.c auth_dialog.h \
 	browser_tabs.c browser_tabs.h \

=== modified file 'src/ui/ui_indicator.c'
--- src/ui/ui_indicator.c	2013-03-25 02:10:13 +0000
+++ src/ui/ui_indicator.c	2013-03-25 03:54:20 +0000
@@ -24,13 +24,10 @@
 
 #include "ui_indicator.h"
 
-#ifdef HAVE_LIBINDICATE
+#ifdef HAVE_MESSAGING_MENU
 
 #include <gtk/gtk.h>
-#include <libindicate/server.h>
-#include <libindicate/indicator.h>
-#include <libindicate-gtk/indicator.h>
-#include <libindicate/interests.h>
+#include <messaging-menu.h>
 #include "feedlist.h"
 #include "feed_list_view.h"
 #include "liferea_shell.h"
@@ -39,15 +36,9 @@
 
 /* The maximum number of feeds to display in the indicator menu. */
 #define MAX_INDICATORS      6
-/* Whether Liferea should set the indicator menu to attention
-   status whenever new feed items are downloaded. Since news feeds
-   do not typically require the user's urgent attention, unlike
-   mail and IM messages, this is set to false by default. */
-#define SET_DRAW_ATTENTION  FALSE
 
 static struct indicator_priv {
-	IndicateServer *server;
-	gboolean visible;
+	MessagingMenuApp *server;
 	GPtrArray *indicators;
 } *indicator_priv = NULL;
 
@@ -55,7 +46,7 @@
  The desktop file to initialize the indicator menu with. Resolves to
  a string like "/usr/share/applications/liferea.desktop".
 */ 
-static const char *DESKTOP_FILE = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "applications" G_DIR_SEPARATOR_S "liferea.desktop";
+static const char *DESKTOP_FILE = "liferea.desktop";
 
 static void
 remove_all_indicators () {
@@ -66,44 +57,18 @@
  Called when the main "Liferea" entry in the indicator menu is clicked.
 */ 
 static void
-on_indicator_server_clicked (IndicateServer *server, gchar *type, gpointer user_data)
+on_indicator_server_clicked (MessagingMenuApp *server, gchar *source_id, gpointer user_data)
 {
 	liferea_shell_present ();
 	remove_all_indicators ();
 }
 
 /*
- Called when the indicator container applet is shown.
-*/ 
-static void
-on_indicator_interest_added (IndicateServer *server, guint interest, gpointer user_data)
-{
-	if (interest != INDICATE_INTEREST_SERVER_SIGNAL)
-		return;
-
-	indicator_priv->visible = TRUE;
-	ui_tray_update ();
-}
-
-/*
- Called when the indicator container applet is hidden.
-*/ 
-static void
-on_indicator_interest_removed (IndicateServer *server, guint interest, gpointer user_data)
-{
-	if (interest != INDICATE_INTEREST_SERVER_SIGNAL)
-		return;
-
-	indicator_priv->visible = FALSE;
-	ui_tray_update ();
-}
-
-/*
  Called when the indicator menu entry for a specific feed
  is clicked, meaning Liferea should switch to that feed.
 */ 
 static void
-on_indicator_clicked (IndicateIndicator *indicator, guint timestamp, gpointer user_data)
+on_indicator_clicked (MessagingMenuApp *indicator, gchar *source_id, gpointer user_data)
 {
 	feed_list_view_select ((nodePtr) user_data);
 	liferea_shell_present ();
@@ -116,8 +81,7 @@
 	if (indicator_priv->server == NULL || indicator == NULL) 
 		return;
 	
-	indicate_server_remove_indicator (indicator_priv->server, INDICATE_INDICATOR(indicator));
-	g_object_unref (G_OBJECT (indicator));
+	messaging_menu_app_remove_source (indicator_priv->server, (char *)(indicator));
 }
 
 void
@@ -127,18 +91,13 @@
 		return;
 	
 	indicator_priv = g_new0 (struct indicator_priv, 1);
-	indicator_priv->visible = FALSE;
 	indicator_priv->indicators = g_ptr_array_new_with_free_func (destroy_indicator);
 	
-	indicator_priv->server = indicate_server_ref_default();
-	indicate_server_set_type (indicator_priv->server, "message.im");
-	indicate_server_set_desktop_file (indicator_priv->server, DESKTOP_FILE);
-	
-	g_signal_connect (G_OBJECT (indicator_priv->server), "server-display", G_CALLBACK (on_indicator_server_clicked), NULL);
-	g_signal_connect (G_OBJECT (indicator_priv->server), "interest-added", G_CALLBACK (on_indicator_interest_added), NULL);
-	g_signal_connect (G_OBJECT (indicator_priv->server), "interest-removed", G_CALLBACK (on_indicator_interest_removed), NULL);
-	
-	indicate_server_show (indicator_priv->server);
+	indicator_priv->server = messaging_menu_app_new (DESKTOP_FILE);
+	messaging_menu_app_register (indicator_priv->server);
+
+	g_signal_connect (G_OBJECT (indicator_priv->server), "activate-source", G_CALLBACK (on_indicator_server_clicked), NULL);
+	
 	ui_indicator_update ();
 }
 
@@ -159,9 +118,10 @@
 static void
 add_node_indicator (nodePtr node)
 {
-	IndicateIndicator *indicator;
-	GdkPixbuf *pixbuf;
+	GFile *file;
+	GIcon *icon;
 	gchar count[10];
+	gchar *signal;
 	
 	if (indicator_priv->indicators->len >= MAX_INDICATORS)
 		return;
@@ -176,30 +136,28 @@
 	if (node->unreadCount == 0)
 		return;
 	
-	indicator = indicate_indicator_new_with_server (indicator_priv->server);
-	g_signal_connect (indicator, "user-display", G_CALLBACK (on_indicator_clicked), node);
-
-	/* load favicon */
-	pixbuf = gdk_pixbuf_new_from_file (node->iconFile, NULL);
-
-	/* display favicon */
-	indicate_gtk_indicator_set_property_icon (indicator, "icon", pixbuf);
-	gdk_pixbuf_unref (pixbuf);
-
-	sprintf (count, "%u", node->unreadCount);
-	indicate_indicator_set_property (indicator, "name", node->title);
-	indicate_indicator_set_property (indicator, "count", count);
-#if SET_DRAW_ATTENTION
-	indicate_indicator_set_property_bool (indicator, "draw-attention", TRUE);
-#endif
-	g_ptr_array_add (indicator_priv->indicators, indicator);
+	file = g_file_new_for_path (node->iconFile);
+	icon = g_file_icon_new (file);
+
+	messaging_menu_app_append_source_with_count(
+		indicator_priv->server,
+		node->id,
+		icon,
+		node->title,
+		node->unreadCount);
+
+	signal = g_strdup_printf("activate-source::%s", node->id);
+	g_signal_connect (indicator_priv->server, signal, G_CALLBACK (on_indicator_clicked), node);
+	g_ptr_array_add (indicator_priv->indicators, node->id);
+
+	g_object_unref(icon);
+	g_object_unref(file);
+	g_free(signal);
 }
 
 void
 ui_indicator_update ()
 {
-	guint index;
-
 	/* Do not update indicators if the user is interacting with the main window */
 	if (!indicator_priv || gtk_window_is_active (GTK_WINDOW (liferea_shell_get_window ())))
 		return;
@@ -208,16 +166,12 @@
 	remove_all_indicators ();
 	/* ...then walk the tree and add an indicator for each unread feed */
 	feedlist_foreach (add_node_indicator);
-
-	/* revert order of items */
-	for (index = indicator_priv->indicators->len; index > 0; index--)
-		indicate_indicator_show (g_ptr_array_index (indicator_priv->indicators, index - 1));	
 }
 
 gboolean
 ui_indicator_is_visible ()
 {
-	return indicator_priv && indicator_priv->visible;
+	return TRUE;
 }
 
 #else
@@ -233,4 +187,4 @@
 void ui_indicator_update () {}
 gboolean ui_indicator_is_visible () { return FALSE; }
 
-#endif  /* HAVE_LIBINDICATE */
+#endif  /* HAVE_MESSAGING_MENU */