2007-10-09 [paul] 3.0.2cvs46

	* src/messageview.c
	* src/summaryview.c
	* src/textview.c
		fix building without compface support

diff --git a/ChangeLog b/ChangeLog
index 1ffb68a3acb323f9a078e396a5f981ab1142aaa4..2246848629a975f9afc849ed43aa8babc2ad6e32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-09 [paul]      3.0.2cvs46
+
+       * src/messageview.c
+       * src/summaryview.c
+       * src/textview.c
+               fix building without compface support
+

 2007-10-09 [colin]     3.0.2cvs45
 
        * src/editaddress.c
 2007-10-09 [colin]     3.0.2cvs45
 
        * src/editaddress.c

diff --git a/PATCHSETS b/PATCHSETS
index fac83c7fe95fd3f4136d004085f5f5965faf36eb..ac546c18b4a0385c79241f0c013768b8ad288192 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2958,3 +2958,4 @@
 ( cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/about.c;  ) > 3.0.2cvs43.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/addrduplicates.c;  cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/addressadd.c;  cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/addressadd.h;  cvs diff -u -r 1.60.2.101 -r 1.60.2.102 src/addressbook.c;  cvs diff -u -r 1.18.2.10 -r 1.18.2.11 src/addressbook.h;  cvs diff -u -r 1.28.2.33 -r 1.28.2.34 src/addrindex.c;  cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/addrindex.h;  cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/addritem.c;  cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/addritem.h;  cvs diff -u -r 1.382.2.414 -r 1.382.2.415 src/compose.c;  cvs diff -u -r 1.14.2.30 -r 1.14.2.31 src/editaddress.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.8.2.22 -r 1.8.2.23 src/headerview.c;  cvs diff -u -r 1.94.2.155 -r 1.94.2.156 src/messageview.c;  cvs diff -u -r 1.83.2.118 -r 1.83.2.119 src/mimeview.c;  cvs diff -u -r 1.395.2.327 -r 1.395.2.328 src/summaryview.c;  cvs diff -u -r 1.96.2.182 -r 1.96.2.183 src/textview.c;  cvs diff -u -r 1.5.2.66 -r 1.5.2.67 src/gtk/gtkutils.c;  ) > 3.0.2cvs44.patchset
 ( cvs diff -u -r 1.14.2.31 -r 1.14.2.32 src/editaddress.c;  cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/headerview.c;  cvs diff -u -r 1.96.2.183 -r 1.96.2.184 src/textview.c;  ) > 3.0.2cvs45.patchset
 ( cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/about.c;  ) > 3.0.2cvs43.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/addrduplicates.c;  cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/addressadd.c;  cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/addressadd.h;  cvs diff -u -r 1.60.2.101 -r 1.60.2.102 src/addressbook.c;  cvs diff -u -r 1.18.2.10 -r 1.18.2.11 src/addressbook.h;  cvs diff -u -r 1.28.2.33 -r 1.28.2.34 src/addrindex.c;  cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/addrindex.h;  cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/addritem.c;  cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/addritem.h;  cvs diff -u -r 1.382.2.414 -r 1.382.2.415 src/compose.c;  cvs diff -u -r 1.14.2.30 -r 1.14.2.31 src/editaddress.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.8.2.22 -r 1.8.2.23 src/headerview.c;  cvs diff -u -r 1.94.2.155 -r 1.94.2.156 src/messageview.c;  cvs diff -u -r 1.83.2.118 -r 1.83.2.119 src/mimeview.c;  cvs diff -u -r 1.395.2.327 -r 1.395.2.328 src/summaryview.c;  cvs diff -u -r 1.96.2.182 -r 1.96.2.183 src/textview.c;  cvs diff -u -r 1.5.2.66 -r 1.5.2.67 src/gtk/gtkutils.c;  ) > 3.0.2cvs44.patchset
 ( cvs diff -u -r 1.14.2.31 -r 1.14.2.32 src/editaddress.c;  cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/headerview.c;  cvs diff -u -r 1.96.2.183 -r 1.96.2.184 src/textview.c;  ) > 3.0.2cvs45.patchset

+( cvs diff -u -r 1.94.2.156 -r 1.94.2.157 src/messageview.c;  cvs diff -u -r 1.395.2.328 -r 1.395.2.329 src/summaryview.c;  cvs diff -u -r 1.96.2.184 -r 1.96.2.185 src/textview.c;  ) > 3.0.2cvs46.patchset

diff --git a/configure.ac b/configure.ac
index 9f70b04191a0b800f7e499ab96c4520ca285706a..6806e362f71acd511fc660f076f9bee696b1935c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=45
+EXTRA_VERSION=46

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/messageview.c b/src/messageview.c
index 89309ad0095750f8da80395580d52a0411204a56..ab3ff1f37d1cc241ebc218da42335a172c13c20b 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -2276,13 +2276,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);
            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);   
        }
                 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));
        procmsg_msginfo_free(full_msginfo);
        if (image)
                picture = gtk_image_get_pixbuf(GTK_IMAGE(image));

diff --git a/src/summaryview.c b/src/summaryview.c
index cfb9f49c6db7d37c1a4baca6dfeca661d59afec2..44f2e412e8ce56856f02075bc446ab5c6ca7f7f6 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4325,13 +4325,16 @@ void summary_add_address(SummaryView *summaryview)
            full_msginfo->extradata &&
            full_msginfo->extradata->face) {
                image = face_get_from_header(full_msginfo->extradata->face);
            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,
                                &summaryview->ctree->style->white,
                                summaryview->mainwin->window->window);  
        }
                 full_msginfo->extradata &&
                 full_msginfo->extradata->xface) {
                image = xface_get_from_header(full_msginfo->extradata->xface,
                                &summaryview->ctree->style->white,
                                summaryview->mainwin->window->window);  
        }

+#endif

        procmsg_msginfo_free(full_msginfo);
        if (image)
                picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
        procmsg_msginfo_free(full_msginfo);
        if (image)
                picture = gtk_image_get_pixbuf(GTK_IMAGE(image));

diff --git a/src/textview.c b/src/textview.c
index a4871fa05cbf9433b38645088c75903312fb9f71..41736fb754e9c07f6435be38ddc941e3d5f7a5da 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -2919,13 +2919,16 @@ static void add_uri_to_addrbook_cb (TextView *textview, guint action, void *data
            textview->messageview->msginfo->extradata &&
            textview->messageview->msginfo->extradata->face) {
                image = face_get_from_header(textview->messageview->msginfo->extradata->face);
            textview->messageview->msginfo->extradata &&
            textview->messageview->msginfo->extradata->face) {
                image = face_get_from_header(textview->messageview->msginfo->extradata->face);

-       } else if (textview->messageview->msginfo &&
+       }
+#if HAVE_LIBCOMPFACE 
+       else if (textview->messageview->msginfo &&

                 textview->messageview->msginfo->extradata &&
                 textview->messageview->msginfo->extradata->xface) {
                image = xface_get_from_header(textview->messageview->msginfo->extradata->xface,
                                &textview->text->style->white,
                                mainwindow_get_mainwindow()->window->window);   
        }
                 textview->messageview->msginfo->extradata &&
                 textview->messageview->msginfo->extradata->xface) {
                image = xface_get_from_header(textview->messageview->msginfo->extradata->xface,
                                &textview->text->style->white,
                                mainwindow_get_mainwindow()->window->window);   
        }

+#endif

        if (image)
                picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
 
        if (image)
                picture = gtk_image_get_pixbuf(GTK_IMAGE(image));