Merging in the menu update branch.

1 files changed, 138 insertions, 4 deletions

diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index efb52b2..0a1002d 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -21,6 +21,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <string.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <libdbusmenu-gtk/menu.h>
 #include <dbus/dbus-glib.h>
@@ -31,12 +32,140 @@ INDICATOR_SET_VERSION
 INDICATOR_SET_NAME("messages")
 
 #include "dbus-data.h"
+#include "messages-service-client.h"
 
-static GtkWidget * main_image;
+static GtkWidget * main_image = NULL;
 
 #define DESIGN_TEAM_SIZE  design_team_size
 static GtkIconSize design_team_size;
 
+static DBusGProxy * icon_proxy = NULL;
+
+static void
+attention_changed_cb (DBusGProxy * proxy, gboolean dot, gpointer userdata)
+{
+	if (dot) {
+		gtk_image_set_from_icon_name(GTK_IMAGE(main_image), "indicator-messages-new", DESIGN_TEAM_SIZE);
+	} else {
+		gtk_image_set_from_icon_name(GTK_IMAGE(main_image), "indicator-messages", DESIGN_TEAM_SIZE);
+	}
+	return;
+}
+
+static void
+icon_changed_cb (DBusGProxy * proxy, gboolean hidden, gpointer userdata)
+{
+	if (hidden) {
+		gtk_widget_hide(main_image);
+	} else {
+		gtk_widget_show(main_image);
+	}
+	return;
+}
+
+static void
+watch_cb (DBusGProxy * proxy, GError * error, gpointer userdata)
+{
+	if (error != NULL) {
+		g_warning("Watch failed!  %s", error->message);
+		g_error_free(error);
+	}
+	return;
+}
+
+static void
+attention_cb (DBusGProxy * proxy, gboolean dot, GError * error, gpointer userdata)
+{
+	if (error != NULL) {
+		g_warning("Unable to get attention status: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	return attention_changed_cb(proxy, dot, userdata);
+}
+
+static void
+icon_cb (DBusGProxy * proxy, gboolean hidden, GError * error, gpointer userdata)
+{
+	if (error != NULL) {
+		g_warning("Unable to get icon visibility: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	return icon_changed_cb(proxy, hidden, userdata);
+}
+
+static gboolean
+setup_icon_proxy (gpointer userdata)
+{
+	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+	if (connection == NULL) {
+		g_warning("Unable to get session bus");
+		return FALSE; /* TRUE? */
+	}
+
+	icon_proxy = dbus_g_proxy_new_for_name(connection,
+	                                       INDICATOR_MESSAGES_DBUS_NAME,
+	                                       INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT,
+	                                       INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE);
+	if (icon_proxy == NULL) {
+		g_warning("Unable to get messages service interface.");
+		return FALSE;
+	}
+	
+	org_ayatana_indicator_messages_service_watch_async(icon_proxy, watch_cb, NULL);
+
+	dbus_g_proxy_add_signal(icon_proxy, "AttentionChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal(icon_proxy,
+	                            "AttentionChanged",
+	                            G_CALLBACK(attention_changed_cb),
+	                            NULL,
+	                            NULL);
+
+	dbus_g_proxy_add_signal(icon_proxy, "IconChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal(icon_proxy,
+	                            "IconChanged",
+	                            G_CALLBACK(icon_changed_cb),
+	                            NULL,
+	                            NULL);
+
+	org_ayatana_indicator_messages_service_attention_requested_async(icon_proxy, attention_cb, NULL);
+	org_ayatana_indicator_messages_service_icon_shown_async(icon_proxy, icon_cb, NULL);
+
+	return FALSE;
+}
+
+static gboolean
+new_launcher_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+{
+	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
+
+	GtkWidget * vbox = gtk_vbox_new(TRUE, 2);
+
+	GtkWidget * app_label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_NAME));
+	gtk_misc_set_alignment(GTK_MISC(app_label), 0.0, 0.5);
+	GtkWidget * dsc_label = gtk_label_new("");
+	gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.05, 0.5);
+	gtk_label_set_ellipsize(GTK_LABEL(dsc_label), PANGO_ELLIPSIZE_END);
+	gchar * markup = g_markup_printf_escaped("<span font-size=\"smaller\">%s</span>", dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_DESC));
+	gtk_label_set_markup(GTK_LABEL(dsc_label), markup);
+	g_free(markup);
+
+	gtk_box_pack_start(GTK_BOX(vbox), app_label, FALSE, FALSE, 0);
+	gtk_widget_show(app_label);
+	gtk_box_pack_start(GTK_BOX(vbox), dsc_label, FALSE, FALSE, 0);
+	gtk_widget_show(dsc_label);
+
+	gtk_container_add(GTK_CONTAINER(gmi), GTK_WIDGET(vbox));
+	gtk_widget_show(GTK_WIDGET(vbox));
+
+	dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
+
+	return TRUE;
+}
+
 GtkLabel *
 get_label (void)
 {
@@ -51,8 +180,6 @@ get_icon (void)
 	main_image = gtk_image_new_from_icon_name("indicator-messages", DESIGN_TEAM_SIZE);
 	gtk_widget_show(main_image);
 
-	/* Need a proxy here to figure out when the icon changes */
-
 	return GTK_IMAGE(main_image);
 }
 
@@ -76,6 +203,13 @@ get_menu (void)
 		return NULL;
 	}
 
-	return GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_MESSAGES_DBUS_NAME, INDICATOR_MESSAGES_DBUS_OBJECT));
+	g_idle_add(setup_icon_proxy, NULL);
+
+	DbusmenuGtkMenu * menu = dbusmenu_gtkmenu_new(INDICATOR_MESSAGES_DBUS_NAME, INDICATOR_MESSAGES_DBUS_OBJECT);
+	DbusmenuGtkClient * client = dbusmenu_gtkmenu_get_client(menu);
+
+	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), LAUNCHER_MENUITEM_TYPE, new_launcher_item);
+
+	return GTK_MENU(menu);
 }