From: Tristan Chabredier <wwp@claws-mail.org>
Date: Tue, 16 May 2006 09:42:16 +0000 (+0000)
Subject: 2006-05-16 [wwp]	2.2.0cvs20
X-Git-Tag: rel_2_3_0~93
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=52e0025a10993e360a23258bef53b03f1220e787

2006-05-16 [wwp]	2.2.0cvs20

	* src/export.c
	* src/matcher.c
	* src/summaryview.c
	* src/etpan/imap-thread.c
		fix some compiler warnings (thanks to Colin).
---

diff --git a/ChangeLog b/ChangeLog
index fd3df3f3b..e156a8b36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-16 [wwp]	2.2.0cvs20
+
+	* src/export.c
+	* src/matcher.c
+	* src/summaryview.c
+	* src/etpan/imap-thread.c
+		fix some compiler warnings (thanks to Colin).
+
 2006-05-16 [wwp]	2.2.0cvs19
 
 	* src/action.c
diff --git a/PATCHSETS b/PATCHSETS
index 008e7996b..0f9a845a6 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1489,3 +1489,4 @@
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/filter_conv_new.pl;  ) > 2.2.0cvs17.patchset
 ( cvs diff -u -r 1.150.2.62 -r 1.150.2.63 src/procmsg.c;  ) > 2.2.0cvs18.patchset
 ( cvs diff -u -r 1.12.2.34 -r 1.12.2.35 src/action.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gedit-print.c;  cvs diff -u -r 1.149.2.47 -r 1.149.2.48 src/inc.c;  cvs diff -u -r 1.274.2.110 -r 1.274.2.111 src/mainwindow.c;  cvs diff -u -r 1.79.2.25 -r 1.79.2.26 src/mh.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/statusbar.c;  cvs diff -u -r 1.17.2.27 -r 1.17.2.28 src/send_message.c;  cvs diff -u -r 1.395.2.198 -r 1.395.2.199 src/summaryview.c;  ) > 2.2.0cvs19.patchset
+( cvs diff -u -r 1.8.2.18 -r 1.8.2.19 src/export.c;  cvs diff -u -r 1.75.2.22 -r 1.75.2.23 src/matcher.c;  cvs diff -u -r 1.395.2.199 -r 1.395.2.200 src/summaryview.c;  cvs diff -u -r 1.1.4.35 -r 1.1.4.36 src/etpan/imap-thread.c;  ) > 2.2.0cvs20.patchset
diff --git a/configure.ac b/configure.ac
index f6d748cd5..2803b7669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 4bec14c77..465d14aec 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -338,7 +338,7 @@ static int etpan_certificate_check(const unsigned char *certificate, int len, vo
 		g_warning("no cert presented.\n");
 		return 0;
 	}
-	cert = d2i_X509(NULL, &certificate, len);
+	cert = d2i_X509(NULL, (unsigned char **) &certificate, len);
 	if (cert == NULL) {
 		g_warning("can't get cert\n");
 		return 0;
diff --git a/src/export.c b/src/export.c
index 13693bbeb..3fbaa55aa 100644
--- a/src/export.c
+++ b/src/export.c
@@ -49,6 +49,7 @@
 #include "folder.h"
 #include "utils.h"
 #include "codeconv.h"
+#include "alertpanel.h"
 
 static GtkWidget *window;
 static GtkWidget *src_entry;
diff --git a/src/matcher.c b/src/matcher.c
index e63009cfd..1c3898719 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -390,7 +390,7 @@ static gboolean matcherprop_string_decode_match(MatcherProp *prop, const gchar *
 		res = matcherprop_string_match(prop, tmp);
 	}
 	
-	if (res == FALSE && strchr(prop->expr, '=') || strchr(prop->expr, '_') ) {
+	if (res == FALSE && (strchr(prop->expr, '=') || strchr(prop->expr, '_')) ) {
 		/* if searching for something with an equal char, maybe 
 		 * we should try to match the non-decoded string. 
 		 * In case it was not qp-encoded. */
diff --git a/src/summaryview.c b/src/summaryview.c
index 10683e314..0e3e08043 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5923,7 +5923,7 @@ gint summaryview_export_mbox_list(SummaryView *summaryview)
 	gint ret;
 	
 	if (mbox == NULL || list == NULL)
-		return;
+		return -1;
 		
 	ret = export_list_to_mbox(list, mbox);