Merge lp:~dbarth/indicator-me/with-about-me into lp:indicator-me

[David Barth]

[David Barth (dbarth)]

Adds the "me item" at the top of the menu. See https://wiki.ubuntu.com/MeMenu#Me item

Doesn't support line wrapping or taking the user avatar yet.

[David Barth (dbarth)]

The branch implements the proper layout for the entry, tests if gnome-about-me is installed or not, and makes the entry sensitive accordingly, calling the program on activation.

[Cody Russell (bratsche)]

In get_pixels_per_em(), the g_return_val_if_fail() parameters are reversed, so this needs to be fixed.

Small thing.. but in about_me_menu_item_class_init(), don't create a GtkObjectClass variable. You can do g_type_class_add_private() using gobject_class.

And lastly, is there any chance at all I could convince you to have your text editor use spaces for indenting instead of tabs? The indentation looks really weird in the merge request and also in my emacs. :)

review: Needs Fixing

[lp:~dbarth/indicator-me/with-about-me]

79. By David Barth on 2010-02-18

re-indent files properly

80. By David Barth on 2010-02-18

do g_return_val_if_fail in the right order; don't create a useless GtkObjectClass

[David Barth (dbarth)]

re-pushed up to revision 80 with the 2 fixes and some re-indentation of the main source files

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-02-04 20:52:03 +0000
+++ src/Makefile.am	2010-02-18 00:41:11 +0000
@@ -8,6 +8,8 @@
 melibdir = $(INDICATORDIR)
 melib_LTLIBRARIES = libme.la
 libme_la_SOURCES = \
+	about-me-menu-item.c \
+	about-me-menu-item.h \
 	indicator-me.c \
 	dbus-shared-names.h \
 	me-service-client.h
 
=== added file 'src/about-me-menu-item.c'
--- src/about-me-menu-item.c	1970-01-01 00:00:00 +0000
+++ src/about-me-menu-item.c	2010-02-18 00:41:11 +0000
@@ -0,0 +1,267 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/*
+ * Copyright 2010 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of either or both of the following licenses:
+ *
+ * 1) the GNU Lesser General Public License version 3, as published by the
+ * Free Software Foundation; and/or
+ * 2) the GNU Lesser General Public License version 2.1, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License version 3 and version 2.1 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authors:
+ *    David Barth <[e-mail]>
+ *    Cody Russell <[e-mail]>
+ */
+
+#include <gtk/gtk.h>
+#include "about-me-menu-item.h"
+
+static GObject* about_me_menu_item_constructor            (GType                  type,
+                                                           guint                  n_construct_properties,
+                                                           GObjectConstructParam *construct_params);
+static void     about_me_menu_item_set_property           (GObject               *object,
+                                                           guint                  prop_id,
+                                                           const GValue          *value,
+                                                           GParamSpec            *pspec);
+static void     about_me_menu_item_get_property           (GObject               *object,
+                                                           guint                  prop_id,
+                                                           GValue                *value,
+                                                           GParamSpec            *pspec);
+
+struct _AboutMeMenuItemPrivate {
+  GtkWidget     *label;
+  GtkWidget     *image;
+  GtkWidget     *hbox;
+  gchar         *realname;
+};
+
+enum {
+  PROP_0,
+  PROP_REALNAME
+};
+
+G_DEFINE_TYPE (AboutMeMenuItem, about_me_menu_item, GTK_TYPE_MENU_ITEM)
+
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ABOUT_ME_TYPE_MENU_ITEM, AboutMeMenuItemPrivate))
+
+static void
+about_me_menu_item_class_init (AboutMeMenuItemClass *item_class)
+{
+  GObjectClass      *gobject_class = G_OBJECT_CLASS (item_class);
+
+  gobject_class->constructor  = about_me_menu_item_constructor;
+  gobject_class->set_property = about_me_menu_item_set_property;
+  gobject_class->get_property = about_me_menu_item_get_property;
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_REALNAME,
+                                   g_param_spec_string ("realname",
+                                                        "Realname",
+                                                        "The \"Realname\" for the user",
+                                                        NULL,
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_type_class_add_private (gobject_class, sizeof (AboutMeMenuItemPrivate));
+}
+
+static void
+about_me_menu_item_init (AboutMeMenuItem *self)
+{
+  AboutMeMenuItemPrivate *priv = GET_PRIVATE (self);
+
+  priv->label = NULL;
+  priv->image = NULL;
+  priv->realname = NULL;
+}
+
+static void
+about_me_menu_item_set_property (GObject         *object,
+                                 guint            prop_id,
+                                 const GValue    *value,
+                                 GParamSpec      *pspec)
+{
+	AboutMeMenuItem *menu_item = ABOUT_ME_MENU_ITEM (object);
+	AboutMeMenuItemPrivate *priv = GET_PRIVATE (menu_item);
+
+	switch (prop_id)
+  {
+	case PROP_REALNAME:
+		g_assert (priv->realname == NULL);
+    priv->realname = g_strdup (g_value_get_string (value));
+		break;
+
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    break;
+  }
+}
+
+static void
+about_me_menu_item_get_property (GObject         *object,
+                                 guint            prop_id,
+                                 GValue          *value,
+                                 GParamSpec      *pspec)
+{
+	AboutMeMenuItem *menu_item = ABOUT_ME_MENU_ITEM (object);
+	AboutMeMenuItemPrivate *priv = GET_PRIVATE (menu_item);
+
+  switch (prop_id)
+  {
+	case PROP_REALNAME:
+		g_value_set_string (value, priv->realname);
+		break;
+
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    break;
+  }
+}
+
+#define DEFAULT_PIXELS_PER_EM        10.0f
+
+static gdouble
+get_pixels_per_em (GtkWidget *widget)
+{
+	g_return_val_if_fail (GTK_IS_WIDGET (widget), DEFAULT_PIXELS_PER_EM);
+
+	/* Note: taken from indicator-session */
+	GtkStyle * style = gtk_widget_get_style(widget);
+
+	PangoLayout * layout = pango_layout_new(gtk_widget_get_pango_context(widget));
+	pango_layout_set_text(layout, "M", -1);
+	pango_layout_set_font_description(layout, style->font_desc);
+
+	gint width;
+	pango_layout_get_pixel_size(layout, &width, NULL);
+
+	gint point = pango_font_description_get_size(style->font_desc);
+	gdouble dpi = gdk_screen_get_resolution(gdk_screen_get_default());
+
+	return ((point * dpi) / 72.0f) / PANGO_SCALE;
+}
+
+
+/* from n-osd */
+static GdkPixbuf*
+load_icon (const gchar* filename,
+           gint         icon_size)
+{
+	GdkPixbuf*    buffer = NULL;
+	GdkPixbuf*    pixbuf = NULL;
+	GtkIconTheme* theme  = NULL;
+	GError*       error  = NULL;
+
+	/* sanity check */
+	g_return_val_if_fail (filename, NULL);
+
+	theme = gtk_icon_theme_get_default ();
+	buffer = gtk_icon_theme_load_icon (theme,
+                                     filename,
+                                     icon_size,
+                                     GTK_ICON_LOOKUP_FORCE_SVG |
+                                     GTK_ICON_LOOKUP_GENERIC_FALLBACK |
+                                     GTK_ICON_LOOKUP_FORCE_SIZE,
+                                     &error);
+	if (error)
+	{
+		g_print ("loading icon '%s' caused error: '%s'",
+             filename,
+             error->message);
+		g_error_free (error);
+		error = NULL;
+		pixbuf = NULL;
+	}
+	else
+	{
+		/* copy and unref buffer so on an icon-theme change old
+		** icons are not kept in memory due to dangling
+		** references, this also makes sure we do not need to
+		** connect to GtkWidget::style-set signal for the
+		** GdkPixbuf we get from gtk_icon_theme_load_icon() */
+		pixbuf = gdk_pixbuf_copy (buffer);
+		g_object_unref (buffer);
+	}
+
+	return pixbuf;
+}
+
+static void
+image_size_allocate (GtkWidget *widget,
+                     GtkAllocation *allocation,
+                     gpointer user_data)
+{
+  gint max = MAX (allocation->width, allocation->height);
+
+  gtk_widget_set_size_request (widget, max, max);
+}
+
+static GObject*
+about_me_menu_item_constructor (GType                  type,
+                                guint                  n_construct_properties,
+                                GObjectConstructParam *construct_params)
+{
+  GObject *object;
+  GtkWidget *hbox;
+  GtkWidget *align;
+  AboutMeMenuItemPrivate *priv;
+  object = G_OBJECT_CLASS (about_me_menu_item_parent_class)->constructor (type,
+                                                                          n_construct_properties,
+                                                                          construct_params);
+
+  priv = GET_PRIVATE (object);
+
+  GtkWidget *frame = gtk_frame_new (NULL);
+  gdouble pixels_per_em = get_pixels_per_em (frame);
+  GdkPixbuf *pixbuf = load_icon ("stock_person", pixels_per_em * 3);
+  priv->image = gtk_image_new_from_pixbuf (pixbuf);
+  g_signal_connect (frame, "size-allocate", G_CALLBACK (image_size_allocate), NULL);
+  gint height, width;
+  gtk_widget_get_size_request (GTK_WIDGET (priv->image), &width, &height);
+  gtk_misc_set_padding (GTK_MISC (priv->image), 2, 2);
+  gtk_container_add (GTK_CONTAINER (frame), priv->image);
+
+  align = gtk_alignment_new (0, 0.3, 0, 0);
+  priv->label = gtk_label_new (priv->realname);
+  gtk_misc_set_padding (GTK_MISC (priv->label), 2, 2);
+  gtk_container_add (GTK_CONTAINER (align), priv->label);
+
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, DEFAULT_PIXELS_PER_EM);
+
+  gtk_container_add (GTK_CONTAINER (object), hbox);
+  gtk_widget_show_all (GTK_WIDGET(object));
+
+  priv->hbox = hbox;
+  
+  return object;
+}
+
+/**
+ * about_me_menu_item_new:
+ * @realname: the name to display in the new menu item.
+ * @returns: a new #AboutMeMenuItem.
+ *
+ * Creates a new #AboutMeMenuItem with a name.
+ **/
+GtkWidget*
+about_me_menu_item_new (const gchar *realname)
+{
+	return g_object_new (ABOUT_ME_TYPE_MENU_ITEM,
+                       "realname", realname,
+                       NULL);
+}
+
+#define __ABOUT_ME_MENU_ITEM_C__
 
=== added file 'src/about-me-menu-item.h'
--- src/about-me-menu-item.h	1970-01-01 00:00:00 +0000
+++ src/about-me-menu-item.h	2010-02-18 00:41:11 +0000
@@ -0,0 +1,65 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/*
+ * Copyright 2010 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of either or both of the following licenses:
+ *
+ * 1) the GNU Lesser General Public License version 3, as published by the
+ * Free Software Foundation; and/or
+ * 2) the GNU Lesser General Public License version 2.1, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License version 3 and version 2.1 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authors:
+ *    David Barth <[e-mail]>
+ *    Cody Russell <[e-mail]>
+ */
+
+#ifndef __ABOUT_ME_MENU_ITEM_H__
+#define __ABOUT_ME_MENU_ITEM_H__
+
+#include <gtk/gtkmenuitem.h>
+
+G_BEGIN_DECLS
+
+#define ABOUT_ME_TYPE_MENU_ITEM         (about_me_menu_item_get_type ())
+#define ABOUT_ME_MENU_ITEM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), ABOUT_ME_TYPE_MENU_ITEM, AboutMeMenuItem))
+#define ABOUT_ME_MENU_ITEM_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), ABOUT_ME_TYPE_MENU_ITEM, AboutMeMenuItemClass))
+#define ABOUT_IS_ME_MENU_ITEM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), ABOUT_ME_TYPE_MENU_ITEM))
+#define ABOUT_IS_ME_MENU_ITEM_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), ABOUT_ME_TYPE_MENU_ITEM))
+#define ABOUT_ME_MENU_ITEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ABOUT_ME_TYPE_MENU_ITEM, AboutMeMenuItemClass))
+
+
+typedef struct _AboutMeMenuItem        AboutMeMenuItem;
+typedef struct _AboutMeMenuItemClass   AboutMeMenuItemClass;
+typedef struct _AboutMeMenuItemPrivate AboutMeMenuItemPrivate;
+
+struct _AboutMeMenuItem
+{
+	GtkMenuItem parent_instance;
+
+	AboutMeMenuItemPrivate *priv;
+};
+
+struct _AboutMeMenuItemClass
+{
+	GtkMenuItemClass parent_class;
+};
+
+
+GType	   about_me_menu_item_get_type            (void) G_GNUC_CONST;
+GtkWidget *about_me_menu_item_new                 (const gchar *name);
+
+G_END_DECLS
+
+#endif /* __ABOUT_ME_MENU_ITEM_H__ */
 
=== modified file 'src/dbus-shared-names.h'
--- src/dbus-shared-names.h	2010-02-04 20:52:03 +0000
+++ src/dbus-shared-names.h	2010-02-18 00:41:11 +0000
@@ -30,7 +30,10 @@
 #define INDICATOR_ME_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/me/service"
 #define INDICATOR_ME_SERVICE_DBUS_INTERFACE "org.ayatana.indicator.me.service"
 
-#define ENTRY_MENUITEM_TYPE           "x-canonical-entry-item"
-#define ENTRY_MENUITEM_PROP_TEXT      "text"
+#define DBUSMENU_ENTRY_MENUITEM_TYPE           "x-canonical-entry-item"
+#define DBUSMENU_ENTRY_MENUITEM_PROP_TEXT      "text"
+
+#define DBUSMENU_ABOUT_ME_MENUITEM_TYPE           "x-canonical-about-me-item"
+#define DBUSMENU_ABOUT_ME_MENUITEM_PROP_NAME      "name"
 
 #endif /* __DBUS_SHARED_NAMES_H__ */
 
=== modified file 'src/entry-menu-item.c'
--- src/entry-menu-item.c	2010-02-04 20:52:03 +0000
+++ src/entry-menu-item.c	2010-02-18 00:41:11 +0000
@@ -113,7 +113,7 @@
 	EntryMenuItem * self = g_object_new(ENTRY_MENU_ITEM_TYPE, NULL);
 	/* EntryMenuItemPrivate * priv = ENTRY_MENU_ITEM_GET_PRIVATE(self); */
 
-	dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, ENTRY_MENUITEM_TYPE);
+	dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_ENTRY_MENUITEM_TYPE);
 
 	return self;
 }
 
=== modified file 'src/indicator-me.c'
--- src/indicator-me.c	2010-02-05 00:43:12 +0000
+++ src/indicator-me.c	2010-02-18 00:41:11 +0000
@@ -1,23 +1,24 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
 /*
-A menu that should be close to the user, it's the user's status,
-their friends.  All about them.  It's a user-focused-menu.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
+  A menu that should be close to the user, it's the user's status,
+  their friends.  All about them.  It's a user-focused-menu.
+
+  Copyright 2009 Canonical Ltd.
+
+  Authors:
+  Ted Gould <[e-mail]>
+
+  This program is free software: you can redistribute it and/or modify it 
+  under the terms of the GNU General Public License version 3, as published 
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranties of 
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+  PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along 
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <glib.h>
@@ -34,6 +35,8 @@
 #include <libindicator/indicator-service-manager.h>
 #include <libido/idoentrymenuitem.h>
 
+#include "about-me-menu-item.h"
+
 #include "dbus-shared-names.h"
 #include "me-service-client.h"
 
@@ -180,10 +183,10 @@
 			DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
 
 			status_proxy = dbus_g_proxy_new_for_name_owner(sbus,
-														   INDICATOR_ME_DBUS_NAME,
-														   INDICATOR_ME_SERVICE_DBUS_OBJECT,
-														   INDICATOR_ME_SERVICE_DBUS_INTERFACE,
-														   &error);
+                                                     INDICATOR_ME_DBUS_NAME,
+                                                     INDICATOR_ME_SERVICE_DBUS_OBJECT,
+                                                     INDICATOR_ME_SERVICE_DBUS_INTERFACE,
+                                                     &error);
 
 			if (error != NULL) {
 				g_warning("Unable to get status proxy: %s", error->message);
@@ -206,13 +209,13 @@
 static void
 entry_prop_change_cb (DbusmenuMenuitem *mi, gchar *prop, GValue *value, GtkEntry *entry)
 {
-	if (g_strcmp0 (prop, ENTRY_MENUITEM_PROP_TEXT) == 0) {
+	if (g_strcmp0 (prop, DBUSMENU_ENTRY_MENUITEM_PROP_TEXT) == 0) {
 		gtk_entry_set_text (entry, g_value_get_string (value));
 	}
 }
 
 static void
-activate_cb (GtkEntry *entry, DbusmenuMenuitem *gmi)
+entry_activate_cb (GtkEntry *entry, DbusmenuMenuitem *gmi)
 {
 	GValue value = { 0 };
 	g_value_init (&value, G_TYPE_STRING);
@@ -225,8 +228,8 @@
 
 static gboolean
 new_entry_item (DbusmenuMenuitem * newitem,
-				DbusmenuMenuitem * parent,
-				DbusmenuClient * client)
+                DbusmenuMenuitem * parent,
+                DbusmenuClient * client)
 {
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
 	g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
@@ -234,8 +237,9 @@
 
 	IdoEntryMenuItem *ido = IDO_ENTRY_MENU_ITEM (ido_entry_menu_item_new ());
 	GtkEntry *entry = GTK_ENTRY(ido_entry_menu_item_get_entry (ido));
-	if (dbusmenu_menuitem_property_get (newitem, ENTRY_MENUITEM_PROP_TEXT) != NULL)
-		gtk_entry_set_text(entry, dbusmenu_menuitem_property_get(newitem, ENTRY_MENUITEM_PROP_TEXT));
+	if (dbusmenu_menuitem_property_get (newitem, DBUSMENU_ENTRY_MENUITEM_PROP_TEXT) != NULL)
+		gtk_entry_set_text(entry, dbusmenu_menuitem_property_get(newitem, DBUSMENU_ENTRY_MENUITEM_PROP_TEXT));
+	gtk_entry_set_width_chars (entry, 23); /* set some nice aspect ratio for the menu */
 
 	dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent);
 	/* disconnect the activate signal that newitem_base connected with the wrong
@@ -244,7 +248,24 @@
 	g_signal_handler_disconnect(GTK_MENU_ITEM (ido), signal_id);
 
 	g_signal_connect (DBUSMENU_MENUITEM (newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK (entry_prop_change_cb), entry);
-	g_signal_connect (GTK_ENTRY (entry), "activate", G_CALLBACK (activate_cb), newitem);
+	g_signal_connect (GTK_ENTRY (entry), "activate", G_CALLBACK (entry_activate_cb), newitem);
+
+	return TRUE;
+}
+
+static gboolean
+new_about_me_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 */
+
+	const gchar *name = dbusmenu_menuitem_property_get (newitem, DBUSMENU_ABOUT_ME_MENUITEM_PROP_NAME);
+	AboutMeMenuItem *about = ABOUT_ME_MENU_ITEM (about_me_menu_item_new (name));
+
+	dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(about), parent);
 
 	return TRUE;
 }
@@ -256,7 +277,8 @@
 	DbusmenuGtkMenu *menu = dbusmenu_gtkmenu_new(INDICATOR_ME_DBUS_NAME, INDICATOR_ME_DBUS_OBJECT);
 	DbusmenuGtkClient * client = dbusmenu_gtkmenu_get_client(menu);
 
-	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), ENTRY_MENUITEM_TYPE, new_entry_item);
+	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_ENTRY_MENUITEM_TYPE, new_entry_item);
+	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_ABOUT_ME_MENUITEM_TYPE, new_about_me_item);
 
 	return GTK_MENU (menu);
 }
 
=== modified file 'src/me-service.c'
--- src/me-service.c	2010-02-05 20:44:54 +0000
+++ src/me-service.c	2010-02-18 00:41:11 +0000
@@ -1,23 +1,24 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
 /*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
+  A small wrapper utility to load indicators and put them as menu items
+  into the gnome-panel using it's applet interface.
+
+  Copyright 2009 Canonical Ltd.
+
+  Authors:
+  Ted Gould <[e-mail]>
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3, as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <config.h>
@@ -142,7 +143,7 @@
 }
 
 static void
-accounts_click (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data)
+spawn_on_activate_cb (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data)
 {
 	GError * error = NULL;
 
@@ -161,24 +162,24 @@
 	/* FIXME: find cmd line parameters with ken-vandine */
 	DbusmenuMenuitem *im_accounts_mi = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(im_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
-								   _("Chat Accounts..."));
+                                 _("Chat Accounts..."));
 	dbusmenu_menuitem_child_append(root, im_accounts_mi);
 	g_signal_connect(G_OBJECT(im_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-					 G_CALLBACK(accounts_click), "empathy -a");
+                   G_CALLBACK(spawn_on_activate_cb), "empathy -a");
 
 	DbusmenuMenuitem *tw_accounts_mi = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(tw_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
-								   _("Broadcast Accounts..."));
+                                 _("Broadcast Accounts..."));
 	dbusmenu_menuitem_child_append(root, tw_accounts_mi);
 	g_signal_connect(G_OBJECT(tw_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-					 G_CALLBACK(accounts_click), "gwibber-accounts");
+                   G_CALLBACK(spawn_on_activate_cb), "gwibber-accounts");
 
 	DbusmenuMenuitem *u1_accounts_mi = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(u1_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
-								   _("Ubuntu One..."));
+                                 _("Ubuntu One..."));
 	dbusmenu_menuitem_child_append(root, u1_accounts_mi);
 	g_signal_connect(G_OBJECT(u1_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-					 G_CALLBACK(accounts_click), "ubuntuone-client-preferences");
+                   G_CALLBACK(spawn_on_activate_cb), "ubuntuone-client-preferences");
 
 }
 
@@ -214,12 +215,23 @@
 
 		if (name[0] != '\0') {
 			DbusmenuMenuitem * useritem = dbusmenu_menuitem_new();
-			dbusmenu_menuitem_property_set(useritem, DBUSMENU_MENUITEM_PROP_LABEL, name);
+			dbusmenu_menuitem_property_set(useritem, DBUSMENU_ABOUT_ME_MENUITEM_PROP_NAME, name);
 			dbusmenu_menuitem_property_set_bool(useritem, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
+			dbusmenu_menuitem_property_set(useritem, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_ABOUT_ME_MENUITEM_TYPE);
 			dbusmenu_menuitem_child_append(root, useritem);
+
+			gchar *gam = g_find_program_in_path("gnome-about-me");
+			if (gam != NULL) {
+				dbusmenu_menuitem_property_set_bool(useritem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+				g_free(gam);
+			}
+
+			g_signal_connect(G_OBJECT(useritem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+                       G_CALLBACK(spawn_on_activate_cb), "gnome-about-me");
 		}
 
 		g_free(name);
+
 	} else {
 		g_debug("PWD: %s", (pwd == NULL ? "(pwd null)" : (pwd->pw_gecos == NULL ? "(gecos null)" : pwd->pw_gecos)));
 	}
@@ -262,7 +274,7 @@
 
 	DbusmenuMenuitem *separator = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE,
-								   DBUSMENU_CLIENT_TYPES_SEPARATOR);
+                                 DBUSMENU_CLIENT_TYPES_SEPARATOR);
 	dbusmenu_menuitem_child_append(root, separator);
 
 	build_accounts_menuitems(root);
@@ -281,7 +293,7 @@
 int
 main (int argc, char ** argv)
 {
-    g_type_init();
+  g_type_init();
 
 	/* Setting up i18n and gettext.  Apparently, we need
 	   all of these. */
@@ -294,17 +306,17 @@
 
 	g_idle_add(build_providers, NULL);
 
-    root_menuitem = dbusmenu_menuitem_new();
-    DbusmenuServer * server = dbusmenu_server_new(INDICATOR_ME_DBUS_OBJECT);
-    dbusmenu_server_set_root(server, root_menuitem);
+  root_menuitem = dbusmenu_menuitem_new();
+  DbusmenuServer * server = dbusmenu_server_new(INDICATOR_ME_DBUS_OBJECT);
+  dbusmenu_server_set_root(server, root_menuitem);
 
 	g_idle_add(build_menu, root_menuitem);
 
 	dbus_interface = g_object_new(STATUS_SERVICE_DBUS_TYPE, NULL);
 
-    mainloop = g_main_loop_new(NULL, FALSE);
-    g_main_loop_run(mainloop);
+  mainloop = g_main_loop_new(NULL, FALSE);
+  g_main_loop_run(mainloop);
 
-    return 0;
+  return 0;
 }