Merging in a branch that updates to the new dbusmenu but also uses it to add a custom launcher item.

1 files changed, 40 insertions, 1 deletions

diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index 0d2854b..c410ef7 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>
@@ -136,6 +137,39 @@ setup_icon_proxy (gpointer userdata)
 	return FALSE;
 }
 
+static gboolean
+new_launcher_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+{
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
+	g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
+	/* Note: not checking parent, it's reasonable for it to be NULL */
+
+	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)
 {
@@ -175,6 +209,11 @@ get_menu (void)
 
 	g_idle_add(setup_icon_proxy, NULL);
 
-	return GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_MESSAGES_DBUS_NAME, INDICATOR_MESSAGES_DBUS_OBJECT));
+	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);
 }