Use new internal plugin for rendering avatars

[claws.git] / src / headerview.c

diff --git a/src/headerview.c b/src/headerview.c
index 2d7074b6a30f34fc365e31920b82bcac4463e3a9..7880d2540bb76aa79ebff6180b4b9aca1a471652 100644 (file)
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -31,10 +31,6 @@
 #include <string.h>
 #include <time.h>
 
-#if HAVE_LIBCOMPFACE
-#  include <compface.h>
-#endif
-
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "headerview.h"
@@ -45,13 +41,10 @@
 #include "base64.h"
 #include "headers.h"
 #include "addrindex.h"
+#include "hooks.h"
+#include "avatars.h"
 
-#if HAVE_LIBCOMPFACE
-static gint headerview_show_xface      (HeaderView     *headerview,
-                                        MsgInfo        *msginfo);
-#endif
-
-static gint headerview_show_face       (HeaderView     *headerview,
+static gint headerview_show_avatar     (HeaderView     *headerview,
                                         MsgInfo        *msginfo);
 static gint headerview_show_contact_pic        (HeaderView     *headerview,
                                         MsgInfo        *msginfo);
@@ -221,91 +214,50 @@ void headerview_show(HeaderView *headerview, MsgInfo *msginfo)
                gtk_widget_show(headerview->tags_body_label);
                g_free(tags);
        }
-       if (!headerview_show_face(headerview, msginfo))
-               return;
-
-#if HAVE_LIBCOMPFACE
-       if (!headerview_show_xface(headerview, msginfo))
+       if (!headerview_show_avatar(headerview, msginfo))
                return;
-#endif
 
        if (!headerview_show_contact_pic(headerview, msginfo))
                return;
 
 }
 
-#if HAVE_LIBCOMPFACE
-static gint headerview_show_xface(HeaderView *headerview, MsgInfo *msginfo)
+static gint headerview_show_avatar (HeaderView *headerview, MsgInfo *msginfo)
 {
+       AvatarRender *avatarr = avatars_avatarrender_new(msginfo);
        GtkWidget *hbox = headerview->hbox;
        GtkWidget *image;
-       gchar *xface = procmsg_msginfo_get_avatar(msginfo, AVATAR_XFACE);
 
-       if (!msginfo->extradata || !xface || strlen(xface) < 5) {
-               if (headerview->image &&
-                   gtk_widget_get_visible(headerview->image)) {
+       hooks_invoke(AVATAR_IMAGE_RENDER_HOOKLIST, avatarr);
+
+       if (!avatarr->image) {
+               if (headerview->image
+                               && gtk_widget_get_visible(headerview->image)) {
                        gtk_widget_hide(headerview->image);
                        gtk_widget_queue_resize(hbox);
                }
+               avatars_avatarrender_free(avatarr);
                return -1;
        }
-       if (!gtk_widget_get_visible(headerview->hbox)) return -1;
-
-       if (headerview->image) {
-               gtk_widget_destroy(headerview->image);
-               headerview->image = NULL;
-       }
-
-       image = xface_get_from_header(xface);
-
-       if (image) {
-               gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-               gtk_widget_show(image);
-       }
-
-       headerview->image = image;
-       if (image) {
-               headerview_save_contact_pic(headerview, msginfo);
-       }
-       return 0;
-}
-#endif
-
-static gint headerview_show_face (HeaderView *headerview, MsgInfo *msginfo)
-{
-       GtkWidget *hbox = headerview->hbox;
-       GtkWidget *image;
-       gchar *face = procmsg_msginfo_get_avatar(msginfo, AVATAR_FACE);
-
-       if (!msginfo->extradata || !face) {
-               if (headerview->image &&
-                   gtk_widget_get_visible(headerview->image)) {
-                       gtk_widget_hide(headerview->image);
-                       gtk_widget_queue_resize(hbox);
-               }
+       if (!gtk_widget_get_visible(hbox)) {
+               avatars_avatarrender_free(avatarr);
                return -1;
        }
-       if (!gtk_widget_get_visible(headerview->hbox)) return -1;
 
        if (headerview->image) {
                gtk_widget_destroy(headerview->image);
                headerview->image = NULL;
        }
 
-       image = face_get_from_header(face);
+       gtk_box_pack_start(GTK_BOX(hbox), avatarr->image, FALSE, FALSE, 0);
+       gtk_widget_show(avatarr->image);
 
-       if (image) {
-               gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-               gtk_widget_show(image);
-       }
+       headerview->image = avatarr->image;
+       avatarr->image = NULL; /* avoid destroying */
+       avatars_avatarrender_free(avatarr);
 
-       headerview->image = image;
-       if (image == NULL)
-               return -1;
-       else {
-               headerview_save_contact_pic(headerview, msginfo);
-               return 0;
-       }
+       headerview_save_contact_pic(headerview, msginfo);
+       return 0;
 }
 
 static void headerview_save_contact_pic (HeaderView *headerview, MsgInfo *msginfo)