talons

commit 4025a2334993eaf3776c6a1d79590c8139bced1e
parent 304874603c8ad0f1397cfdadbd222d03182539ef
Author: Paul Mangan <paul@claws-mail.org>
Date:   Mon, 16 Mar 2009 20:08:15 +0000

2009-03-16 [paul]	3.7.1cvs17

	* src/prefs_customheader.c
		add forgotten #if HAVE_LIBCOMPFACE

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_customheader.c
 | 
8
++++++--

4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-16 [paul]	3.7.1cvs17
+
+	* src/prefs_customheader.c
+		add forgotten #if HAVE_LIBCOMPFACE
+
 2009-03-16 [paul]	3.7.1cvs16
 
 	* src/prefs_customheader.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3756,3 +3756,4 @@
 ( cvs diff -u -r 1.382.2.503 -r 1.382.2.504 src/compose.c;  cvs diff -u -r 1.213.2.190 -r 1.213.2.191 src/folder.c;  cvs diff -u -r 1.87.2.58 -r 1.87.2.59 src/folder.h;  cvs diff -u -r 1.16.2.65 -r 1.16.2.66 src/msgcache.c;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/common/prefs.c;  ) > 3.7.1cvs14.patchset
 ( cvs diff -u -r 1.16.2.34 -r 1.16.2.35 src/prefs_customheader.c;  ) > 3.7.1cvs15.patchset
 ( cvs diff -u -r 1.16.2.35 -r 1.16.2.36 src/prefs_customheader.c;  ) > 3.7.1cvs16.patchset
+( cvs diff -u -r 1.16.2.36 -r 1.16.2.37 src/prefs_customheader.c;  ) > 3.7.1cvs17.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
@@ -921,7 +921,9 @@ static gboolean prefs_custom_header_selected(GtkTreeSelection *selector,
 		gtk_object_ref (G_OBJECT(preview));
 		gtk_object_sink (G_OBJECT(preview));
 #endif
-	} else if (!g_strcmp0("X-Face", ch->name)) {
+	} 
+#if HAVE_LIBCOMPFACE
+else if (!g_strcmp0("X-Face", ch->name)) {
 		GdkColor color;
 		color.pixel = 0;
 		preview = GTK_IMAGE(xface_get_from_header(ch->value, 
@@ -936,7 +938,9 @@ static gboolean prefs_custom_header_selected(GtkTreeSelection *selector,
 		gtk_object_ref (G_OBJECT(preview));
 		gtk_object_sink (G_OBJECT(preview));
 #endif
-	} else {
+	} 
+#endif
+else {
 		gtk_widget_hide(customhdr.preview);
 	}
 	return TRUE;