2007-04-26 [colin] 2.9.1cvs25

	* src/folder.c
		Always fetch body+headers in folders that are
		synched for offline use, if "Synchronise as
		soon as possible" is set.
		Fixes bug 1200, 'Add option to always retrieve full
		messages'

diff --git a/ChangeLog b/ChangeLog
index 564b39f54ca74eb57cccadeaaf464a29c648a1a9..5305ee1f2047500cae8f58a2ef0105e9e582abde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-04-26 [colin]     2.9.1cvs25
+
+       * src/folder.c
+               Always fetch body+headers in folders that are
+               synched for offline use, if "Synchronise as
+               soon as possible" is set.
+               Fixes bug 1200, 'Add option to always retrieve full 
+               messages'
+

 2007-04-25 [colin]     2.9.1cvs24
 
        * src/compose.c
 2007-04-25 [colin]     2.9.1cvs24
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index e36439b072f49ac3c41861928e985a83722f3521..9b0a16f56c81f6b39405dd41d92a9d0fa914d946 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2552,3 +2552,4 @@
 ( cvs diff -u -r 1.382.2.373 -r 1.382.2.374 src/compose.c;  ) > 2.9.1cvs22.patchset
 ( cvs diff -u -r 1.207.2.161 -r 1.207.2.162 src/folderview.c;  ) > 2.9.1cvs23.patchset
 ( cvs diff -u -r 1.382.2.374 -r 1.382.2.375 src/compose.c;  ) > 2.9.1cvs24.patchset
 ( cvs diff -u -r 1.382.2.373 -r 1.382.2.374 src/compose.c;  ) > 2.9.1cvs22.patchset
 ( cvs diff -u -r 1.207.2.161 -r 1.207.2.162 src/folderview.c;  ) > 2.9.1cvs23.patchset
 ( cvs diff -u -r 1.382.2.374 -r 1.382.2.375 src/compose.c;  ) > 2.9.1cvs24.patchset

+( cvs diff -u -r 1.213.2.141 -r 1.213.2.142 src/folder.c;  ) > 2.9.1cvs25.patchset

diff --git a/configure.ac b/configure.ac
index 5690a82ff6491d4b62f1a1485334220ca6a5f8f6..f1443d2f1d9abad13ed3ec817f4865a09800e444 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=24
+EXTRA_VERSION=25

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 9fa62e8863d12a314544ae061c146fdf8c685085..71059a3109557f321b1ef3243a2286b249948513 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2525,7 +2525,11 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
        if (folder->klass->fetch_msg_full == NULL)
                return folder_item_fetch_msg(item, num);
 
        if (folder->klass->fetch_msg_full == NULL)
                return folder_item_fetch_msg(item, num);
 

-       msgfile = folder->klass->fetch_msg_full(folder, item, num, 
+       if (item->prefs->offlinesync && prefs_common.real_time_sync)
+               msgfile = folder->klass->fetch_msg_full(folder, item, num, 
+                                               TRUE, TRUE);
+       else
+               msgfile = folder->klass->fetch_msg_full(folder, item, num, 

                                                headers, body);
 
        if (msgfile != NULL) {
                                                headers, body);
 
        if (msgfile != NULL) {