2007-03-04 [iwkse] 2.8.0cvs12

	* src/imap.c
		fix: alertpanel.h included only in #ifdef HAVE_LIBETPAN

diff --git a/ChangeLog b/ChangeLog
index 09042fba397003044e6c8390986411c18c3a1373..af4e08a6a3b2a5f32ce466cdb86ad9b7db10f9c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-04 [iwkse]     2.8.0cvs12
+
+       * src/imap.c
+               fix: alertpanel.h included only in #ifdef HAVE_LIBETPAN
+
 2007-03-03 [colin]     2.8.0cvs11
 
        * src/plugins/pgpinline/pgpinline.c

diff --git a/PATCHSETS b/PATCHSETS
index cb2ab547f207eba954a88b6b55d9a39dc1fefa50..2a383ad1601c245fde14cf8434d1234549becdf7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2404,3 +2404,4 @@
 ( cvs diff -u -r 1.28.2.33 -r 1.28.2.34 src/mbox.c;  ) > 2.8.0cvs9.patchset
 ( cvs diff -u -r 1.654.2.2458 -r 1.654.2.2459 configure.ac;  cvs diff -u -r 1.115.2.140 -r 1.115.2.141 src/main.c;  cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/plugin.c;  ) > 2.8.0cvs10.patchset
 ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpinline/pgpinline.c;  ) > 2.8.0cvs11.patchset
+( cvs diff -u -r 1.179.2.156 -r 1.179.2.157 src/imap.c;  ) > 2.8.0cvs12.patchset

diff --git a/configure.ac b/configure.ac
index 151b5775d73391d696df43417d946526202261f5..3f9050520c3296864079adce2612e8bb3d915c5d 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=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index f341f3efabf921bd1ce4993b506ffe672c1cebff..b4d749eec1fceb9a43da335ed38716296d833108 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -31,6 +31,7 @@
 #include "imap_gtk.h"
 #include "inc.h"
 #include "xml.h"
+#include "alertpanel.h"
 
 #ifdef HAVE_LIBETPAN
 
@@ -63,7 +64,6 @@
 #include "inputdialog.h"
 #include "log.h"
 #include "remotefolder.h"
-#include "alertpanel.h"
 #include "claws.h"
 #include "statusbar.h"
 #include "msgcache.h"