From: Colin Leroy <colin@colino.net>
Date: Tue, 4 Jul 2006 16:32:15 +0000 (+0000)
Subject: 2006-07-04 [colin]	2.3.1cvs57
X-Git-Tag: rel_2_4_0~41
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5928e9b56433f7287a35d715ae97d27b49b9c797

2006-07-04 [colin]	2.3.1cvs57

	* src/mainwindow.c
	* src/news.c
		Warning fixes, thanks to Fabien
---

diff --git a/ChangeLog b/ChangeLog
index 15c2fcc43..a9d5d549c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-04 [colin]	2.3.1cvs57
+
+	* src/mainwindow.c
+	* src/news.c
+		Warning fixes, thanks to Fabien
+
 2006-07-04 [colin]	2.3.1cvs56
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
index 3e3ab5987..14268f2ea 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1657,3 +1657,4 @@
 ( cvs diff -u -r 1.101.2.26 -r 1.101.2.27 src/news.c;  ) > 2.3.1cvs54.patchset
 ( cvs diff -u -r 1.207.2.107 -r 1.207.2.108 src/folderview.c;  cvs diff -u -r 1.60.2.34 -r 1.60.2.35 src/prefs_actions.c;  cvs diff -u -r 1.59.2.34 -r 1.59.2.35 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.39 -r 1.43.2.40 src/prefs_matcher.c;  cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/prefs_template.c;  ) > 2.3.1cvs55.patchset
 ( cvs diff -u -r 1.83.2.73 -r 1.83.2.74 src/mimeview.c;  cvs diff -u -r 1.20.2.9 -r 1.20.2.10 src/mimeview.h;  cvs diff -u -r 1.96.2.119 -r 1.96.2.120 src/textview.c;  ) > 2.3.1cvs56.patchset
+( cvs diff -u -r 1.274.2.122 -r 1.274.2.123 src/mainwindow.c;  cvs diff -u -r 1.101.2.27 -r 1.101.2.28 src/news.c;  ) > 2.3.1cvs57.patchset
diff --git a/configure.ac b/configure.ac
index efa774f09..ca3bb65b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=56
+EXTRA_VERSION=57
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 01d12b4e0..945d962a7 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -94,6 +94,7 @@
 #include "icon_legend.h"
 #include "colorlabel.h"
 #include "textview.h"
+#include "imap.h"
 
 #define AC_LABEL_WIDTH	240
 
diff --git a/src/news.c b/src/news.c
index 5a2f66e80..aabeab341 100644
--- a/src/news.c
+++ b/src/news.c
@@ -175,11 +175,9 @@ static int news_remove_msg		 (Folder 	*folder,
 					  gint 		 msgnum)
 {
 	gchar *path, *filename;
-	NNTPSession *session;
-	gint ok;
 
-	g_return_val_if_fail(folder != NULL, NULL);
-	g_return_val_if_fail(item != NULL, NULL);
+	g_return_val_if_fail(folder != NULL, -1);
+	g_return_val_if_fail(item != NULL, -1);
 
 	path = folder_item_get_path(item);
 	if (!is_dir_exist(path))