talons

commit ed4cf3edd8903bf026e070e5ff60574cc8c30ca5
parent 272d0ba42dc669be2352c18b904c792e8984b6f6
Author: Colin Leroy <colin@colino.net>
Date:   Mon,  6 Jul 2009 07:35:54 +0000

2009-07-06 [colin]	3.7.2cvs2

	* src/prefs_customheader.c
		Fix build failure

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

4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-06 [colin]	3.7.2cvs2
+
+	* src/prefs_customheader.c
+		Fix build failure
+
 2009-07-04 [paul]	3.7.2cvs1
 
 	* tools/claws.i18n.status.pl
diff --git a/PATCHSETS b/PATCHSETS
@@ -3826,3 +3826,4 @@
 ( cvs diff -u -r 1.204.2.190 -r 1.204.2.191 src/prefs_common.c;  ) > 3.7.1cvs84.patchset
 ( cvs diff -u -r 1.100.2.70 -r 1.100.2.71 AUTHORS;  cvs diff -u -r 1.654.2.3892 -r 1.654.2.3893 configure.ac;  cvs diff -u -r 1.21.2.8 -r 1.21.2.9 po/bg.po;  cvs diff -u -r 1.9.2.15 -r 1.9.2.16 po/cs.po;  cvs diff -u -r 1.58.2.43 -r 1.58.2.44 po/de.po;  cvs diff -u -r 1.60.2.58 -r 1.60.2.59 po/es.po;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 po/fi.po;  cvs diff -u -r 1.42.2.46 -r 1.42.2.47 po/fr.po;  cvs diff -u -r 1.5.2.13 -r 1.5.2.14 po/hu.po;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 po/id.po;  cvs diff -u -r 1.34.2.28 -r 1.34.2.29 po/it.po;  cvs diff -u -r 1.16.2.8 -r 1.16.2.9 po/ja.po;  cvs diff -u -r 1.50.2.35 -r 1.50.2.36 po/pt_BR.po;  diff -u /dev/null po/pt_PT.po;  cvs diff -u -r 1.17.2.19 -r 1.17.2.20 po/ru.po;  cvs diff -u -r 1.2.2.27 -r 1.2.2.28 po/sk.po;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/gtk/authors.h;  ) > 3.7.1cvs85.patchset
 ( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 tools/claws.i18n.status.pl;  ) > 3.7.2cvs1.patchset
+( cvs diff -u -r 1.16.2.37 -r 1.16.2.38 src/prefs_customheader.c;  ) > 3.7.2cvs2.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
@@ -910,7 +910,7 @@ static gboolean prefs_custom_header_selected(GtkTreeSelection *selector,
 
 	ENTRY_SET_TEXT(customhdr.hdr_entry, ch->name);
 	ENTRY_SET_TEXT(customhdr.val_entry, ch->value);
-	if (!g_strcmp0("Face",ch->name)) {
+	if (!strcmp2("Face",ch->name)) {
 		preview = GTK_IMAGE(face_get_from_header (ch->value));
 		pixbuf = gtk_image_get_pixbuf(preview);
 		gtk_image_set_from_pixbuf (GTK_IMAGE(customhdr.preview), pixbuf);
@@ -923,7 +923,7 @@ static gboolean prefs_custom_header_selected(GtkTreeSelection *selector,
 #endif
 	} 
 #if HAVE_LIBCOMPFACE
-else if (!g_strcmp0("X-Face", ch->name)) {
+else if (!strcmp2("X-Face", ch->name)) {
 		GdkColor color;
 		color.pixel = 0;
 		preview = GTK_IMAGE(xface_get_from_header(ch->value,