Merge lp:~dbarth/indicator-me/avatar-support into lp:indicator-me

[David Barth]

[David Barth (dbarth)]

This adds support for avatar icons, ie the one set by the user in the about-me preference dialog

[Ted Gould (ted)]

Some minor things:

     1. You need to free "file" as it's an allocated string.
     2. The buf structure should probably be a _g_stat_struct as that's
        what the g_stat function takes. In theory it should be the
        same... but :)
     3. The size variable is a double, but then it's passed into the
        pixbuf allocator which takes an int. This will cause
        truncation, is that what you want? If so, it'd probably good to
        have a comment saying as such.
     4. Need to check in your error handler if error != NULL as you're
        looking at the message property. It could be that error isn't
        set.

Clean up stuff, otherwise it looks good.

  review approve

review: Approve

[lp:~dbarth/indicator-me/avatar-support]

81. By David Barth on 2010-03-01

fixes for error cases and type truncations

[David Barth (dbarth)]

Fixed in revision 81, except for the stat struct for which the doc and the API seem out of sync.

=== modified file 'src/about-me-menu-item.c'
--- src/about-me-menu-item.c	2010-02-18 00:39:49 +0000
+++ src/about-me-menu-item.c	2010-03-01 23:34:13 +0000
@@ -25,6 +25,12 @@
  *    Cody Russell <[e-mail]>
  */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <glib/gstdio.h>
+
 #include <gtk/gtk.h>
 #include "about-me-menu-item.h"
 
@@ -197,6 +203,54 @@
 	return pixbuf;
 }
 
+
+static gboolean
+load_avatar (gpointer data)
+{
+  g_return_val_if_fail (ABOUT_IS_ME_MENU_ITEM (data), FALSE);
+
+  AboutMeMenuItemPrivate *priv = GET_PRIVATE (data);
+
+  /* check if the user defined an avatar */
+	gchar *file = g_build_filename (g_get_home_dir (), ".face", NULL);
+
+  struct stat buf;
+  if (! (g_stat (file, &buf) == 0 && buf.st_size > 0)) {
+    goto avatar_fail;
+  }
+
+  if (buf.st_size > 1024*1024) {
+    g_warning ("avatar file too large (%lld)", (long long)buf.st_size);
+    goto avatar_fail;
+  }
+
+  GError *error = NULL;
+  int size = get_pixels_per_em (priv->image) * 3;
+
+  GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_scale (file, -1, size, TRUE,
+                                                         &error);
+  if (pixbuf == NULL) {
+    if (error != NULL) {
+      g_warning ("Couldn't read file %s: %s", file, error->message);
+      g_error_free (error);
+    }
+    goto avatar_fail;
+  }
+
+  gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
+
+  g_object_unref (pixbuf);
+  g_free (file);
+
+  return TRUE;
+
+avatar_fail:
+  g_free (file);
+
+  return FALSE;
+}
+
+
 static void
 image_size_allocate (GtkWidget *widget,
                      GtkAllocation *allocation,
@@ -227,11 +281,12 @@
   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);
 
+  /* try to load a personalized icon */
+  g_idle_add (load_avatar, (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);