From: Colin Leroy <colin@colino.net>
Date: Sun, 4 Mar 2007 18:04:02 +0000 (+0000)
Subject: 2007-03-04 [colin]	2.8.0cvs16
X-Git-Tag: rel_2_9_0~114
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=59c5c1e1f619f4a35bf9e83cd6378af36d85e373

2007-03-04 [colin]	2.8.0cvs16

	* src/imap.c
		Fix bug 1140, wrong return value
		without libetpan
---

diff --git a/ChangeLog b/ChangeLog
index 655791be2..48b21bc15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-04 [colin]	2.8.0cvs16
+
+	* src/imap.c
+		Fix bug 1140, wrong return value
+		without libetpan
+
 2007-03-04 [wwp]	2.8.0cvs15
 
 	* src/addr_compl.c
diff --git a/PATCHSETS b/PATCHSETS
index a038bd18e..be1dab603 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2408,3 +2408,4 @@
 ( cvs diff -u -r 1.27.2.30 -r 1.27.2.31 src/addr_compl.c;  ) > 2.8.0cvs13.patchset
 ( cvs diff -u -r 1.27.2.31 -r 1.27.2.32 src/addr_compl.c;  ) > 2.8.0cvs14.patchset
 ( cvs diff -u -r 1.27.2.32 -r 1.27.2.33 src/addr_compl.c;  ) > 2.8.0cvs15.patchset
+( cvs diff -u -r 1.179.2.157 -r 1.179.2.158 src/imap.c;  ) > 2.8.0cvs16.patchset
diff --git a/configure.ac b/configure.ac
index 232c08848..675f4e2da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
index b4d749eec..4a7a25b24 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -4601,7 +4601,7 @@ gint imap_subscribe(Folder *folder, FolderItem *item, gchar *rpath, gboolean sub
 
 GList * imap_scan_subtree(Folder *folder, FolderItem *item, gboolean unsubs_only, gboolean recursive)
 {
-	return -1;
+	return NULL;
 }
 #endif