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 655791be2906757d5900cd3cbc5acaab459447f4..48b21bc15a66155be3f827c64c3203ca6c52c9da 100644 (file)
--- 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 a038bd18e06b0512864b1b9a396f7023dafb6392..be1dab60330ff98edd56832d0195510eed83eaec 100644 (file)
--- 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 232c08848dbb3322b0d06153dc1199b968b7a5b1..675f4e2da7fd1c40e9a9562d0ec95d9fdb19fe97 100644 (file)
--- 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 b4d749eec1fceb9a43da335ed38716296d833108..4a7a25b242727e25ec491f738174a17273f364b4 100644 (file)
--- 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