2007-10-10 [claws] 3.0.2cvs49

[claws.git] / src / messageview.c

diff --git a/src/messageview.c b/src/messageview.c
index 89309ad0095750f8da80395580d52a0411204a56..19f8db7f3f976e6186d9dc2b5b4d887c22733c03 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -2265,7 +2265,9 @@ static void add_address_cb(gpointer data, guint action, GtkWidget *widget)
        GtkWidget *image = NULL;
        GdkPixbuf *picture = NULL;
 
-       if (!messageview->msginfo) return;
+       if (!messageview->msginfo || !messageview->msginfo->from) 
+               return;
+
        msginfo = messageview->msginfo;
        Xstrdup_a(from, msginfo->from, return);
        eliminate_address_comment(from);
@@ -2276,13 +2278,16 @@ static void add_address_cb(gpointer data, guint action, GtkWidget *widget)
            full_msginfo->extradata &&
            full_msginfo->extradata->face) {
                image = face_get_from_header(full_msginfo->extradata->face);
-       } else if (full_msginfo &&
+       } 
+#if HAVE_LIBCOMPFACE
+       else if (full_msginfo &&
                 full_msginfo->extradata &&
                 full_msginfo->extradata->xface) {
                image = xface_get_from_header(full_msginfo->extradata->xface,
                                &messageview->mainwin->summaryview->ctree->style->white,
                                messageview->window->window);   
        }
+#endif
        procmsg_msginfo_free(full_msginfo);
        if (image)
                picture = gtk_image_get_pixbuf(GTK_IMAGE(image));