Merge lp:~dbarth/indicator-me/panel-icon-fix into lp:indicator-me

[David Barth]

Fixes panel icon loading to user the indicator_helper function and adds a '-panel' suffix. Also some avatar changes / cleanups.

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/about-me-menu-item.c'
--- src/about-me-menu-item.c	2010-03-11 13:15:06 +0000
+++ src/about-me-menu-item.c	2010-03-11 17:18:24 +0000
@@ -243,18 +243,6 @@
   return TRUE;
 }
 
-static gboolean
-load_avatar_task (gpointer object)
-{
-  g_return_val_if_fail (ABOUT_IS_ME_MENU_ITEM (object), FALSE);
-
-	gchar *file = g_build_filename (g_get_home_dir (), ".face", NULL);
-  about_me_menu_item_load_avatar (ABOUT_ME_MENU_ITEM(object), file);
-  g_free (file);
-
-  return FALSE;
-}
-
 static void
 image_size_allocate (GtkWidget *widget,
                      GtkAllocation *allocation,
@@ -288,9 +276,6 @@
   gtk_misc_set_padding (GTK_MISC (priv->image), 2, 2);
   gtk_container_add (GTK_CONTAINER (frame), priv->image);
 
-  /* try to load a personalized icon */
-  g_idle_add (load_avatar_task, (gpointer)object);
-
   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);

=== modified file 'src/indicator-me.c'
--- src/indicator-me.c	2010-03-11 13:06:53 +0000
+++ src/indicator-me.c	2010-03-11 17:18:24 +0000
@@ -33,6 +33,7 @@
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>
 #include <libindicator/indicator-service-manager.h>
+#include <libindicator/indicator-image-helper.h>
 #include <libido/idoentrymenuitem.h>
 
 #include "about-me-menu-item.h"
@@ -173,11 +174,15 @@
 	g_return_if_fail(icons[0] != '\0');
 
 	if (status_image == NULL) {
-		status_image = GTK_IMAGE(gtk_image_new_from_icon_name(DEFAULT_ICON, GTK_ICON_SIZE_MENU));
+    status_image = indicator_image_helper (DEFAULT_ICON "-panel");
 		gtk_widget_show(GTK_WIDGET(status_image));
 	}
 
-	gtk_image_set_from_icon_name(status_image, icons, GTK_ICON_SIZE_MENU);
+  gchar *panel_icon = g_strconcat (icons, "-panel", NULL);
+  GtkImage *temp = indicator_image_helper (panel_icon);
+  gtk_image_set_from_pixbuf (status_image, gtk_image_get_pixbuf (temp));
+  g_object_unref (temp);
+  g_free (panel_icon);
 
 	return;
 }
@@ -302,9 +307,12 @@
 
 	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);
-	g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(about_me_prop_change_cb), about);
+  if (about != NULL) {
+    dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(about), parent);
+    const gchar *avatar = dbusmenu_menuitem_property_get (newitem, DBUSMENU_ABOUT_ME_MENUITEM_PROP_ICON);
+    about_me_menu_item_load_avatar (about, avatar);
+    g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(about_me_prop_change_cb), about);
+  }
 
 	return TRUE;
 }