2007-10-15 [colin] 3.0.2cvs74

	* src/imap.c
		Don't build imap_synchronise at all when
		building without libetpan

diff --git a/ChangeLog b/ChangeLog
index 804e5b0ab3ce58bf2c2e7fe6fe7d641387296c4d..35fa87933f2ef06624542c71efc6f4784bb388c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-15 [colin]     3.0.2cvs74
+
+       * src/imap.c
+               Don't build imap_synchronise at all when 
+               building without libetpan
+

 2007-10-14 [colin]     3.0.2cvs73
 
        * src/imap.c
 2007-10-14 [colin]     3.0.2cvs73
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 7d8a2ad3ed86a55e9558b2173f206de9bd8e052a..fe4a1bb637ddb05935817de340176a4a27344c37 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2986,3 +2986,4 @@
 ( cvs diff -u -r 1.36.2.120 -r 1.36.2.121 src/common/utils.c;  ) > 3.0.2cvs71.patchset
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/addrquery.c;  cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/addrquery.h;  cvs diff -u -r 1.17.2.11 -r 1.17.2.12 src/recv.c;  cvs diff -u -r 1.6.12.5 -r 1.6.12.6 src/recv.h;  cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/vcard.c;  cvs diff -u -r 1.5.12.5 -r 1.5.12.6 src/vcard.h;  cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/common/xml.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/common/xml.h;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/xmlprops.c;  cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/common/xmlprops.h;  ) > 3.0.2cvs72.patchset
 ( cvs diff -u -r 1.179.2.192 -r 1.179.2.193 src/imap.c;  cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/common/md5.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/md5.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/manage_window.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/manage_window.h;  ) > 3.0.2cvs73.patchset
 ( cvs diff -u -r 1.36.2.120 -r 1.36.2.121 src/common/utils.c;  ) > 3.0.2cvs71.patchset
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/addrquery.c;  cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/addrquery.h;  cvs diff -u -r 1.17.2.11 -r 1.17.2.12 src/recv.c;  cvs diff -u -r 1.6.12.5 -r 1.6.12.6 src/recv.h;  cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/vcard.c;  cvs diff -u -r 1.5.12.5 -r 1.5.12.6 src/vcard.h;  cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/common/xml.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/common/xml.h;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/xmlprops.c;  cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/common/xmlprops.h;  ) > 3.0.2cvs72.patchset
 ( cvs diff -u -r 1.179.2.192 -r 1.179.2.193 src/imap.c;  cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/common/md5.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/md5.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/manage_window.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/manage_window.h;  ) > 3.0.2cvs73.patchset

+( cvs diff -u -r 1.179.2.193 -r 1.179.2.194 src/imap.c;  ) > 3.0.2cvs74.patchset

diff --git a/configure.ac b/configure.ac
index ee999148c050a07195e6d02a57e5cab5a617f628..5f62b45cb5936f0a4f7107e4935c16d8484b5937 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=73
+EXTRA_VERSION=74

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index eb97a3ad99d30a1acc3dd6a7017bb97f0b41ae16..cd4fbb43be7961420a0e553b01a8805038eec247 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -309,7 +309,9 @@ static gchar imap_get_path_separator                (IMAPSession    *session,
 static gchar *imap_get_real_path               (IMAPSession    *session,
                                                 IMAPFolder     *folder,
                                                 const gchar    *path);
 static gchar *imap_get_real_path               (IMAPSession    *session,
                                                 IMAPFolder     *folder,
                                                 const gchar    *path);

+#ifdef HAVE_LIBETPAN

 static void imap_synchronise           (FolderItem     *item, gint days);
 static void imap_synchronise           (FolderItem     *item, gint days);

+#endif

 static gboolean imap_is_busy           (Folder *folder);
 
 static void imap_free_capabilities     (IMAPSession    *session);
 static gboolean imap_is_busy           (Folder *folder);
 
 static void imap_free_capabilities     (IMAPSession    *session);


@@ -5095,9 +5097,9 @@ gboolean imap_cancel_all_enabled(void)
 
 #endif
 
 
 #endif
 

+#ifdef HAVE_LIBETPAN

 static void imap_synchronise(FolderItem *item, gint days) 
 {
 static void imap_synchronise(FolderItem *item, gint days) 
 {

-#ifdef HAVE_LIBETPAN

        if (IMAP_FOLDER_ITEM(item)->last_sync == IMAP_FOLDER_ITEM(item)->last_change) {
                debug_print("%s already synced\n", item->path?item->path:item->name);
                return;
        if (IMAP_FOLDER_ITEM(item)->last_sync == IMAP_FOLDER_ITEM(item)->last_change) {
                debug_print("%s already synced\n", item->path?item->path:item->name);
                return;


@@ -5105,8 +5107,8 @@ static void imap_synchronise(FolderItem *item, gint days)
        debug_print("syncing %s\n", item->path?item->path:item->name);
        imap_gtk_synchronise(item, days);
        IMAP_FOLDER_ITEM(item)->last_sync = IMAP_FOLDER_ITEM(item)->last_change;
        debug_print("syncing %s\n", item->path?item->path:item->name);
        imap_gtk_synchronise(item, days);
        IMAP_FOLDER_ITEM(item)->last_sync = IMAP_FOLDER_ITEM(item)->last_change;

-#endif

 }
 }

+#endif

 
 static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 {
 
 static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 {