aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@src.gnome.org>2000-08-12 03:07:13 +0800
committerPeter Williams <peterw@src.gnome.org>2000-08-12 03:07:13 +0800
commit4824927269ed26278e9cddc9d523ad813d0fd626 (patch)
tree1ffd8329e68afa96c32149a287ef0742aa03c34d
parente7ea4f09d395f5656b959ebc1a0016608fe1b0fd (diff)
downloadgsoc2013-evolution-4824927269ed26278e9cddc9d523ad813d0fd626.tar
gsoc2013-evolution-4824927269ed26278e9cddc9d523ad813d0fd626.tar.gz
gsoc2013-evolution-4824927269ed26278e9cddc9d523ad813d0fd626.tar.bz2
gsoc2013-evolution-4824927269ed26278e9cddc9d523ad813d0fd626.tar.lz
gsoc2013-evolution-4824927269ed26278e9cddc9d523ad813d0fd626.tar.xz
gsoc2013-evolution-4824927269ed26278e9cddc9d523ad813d0fd626.tar.zst
gsoc2013-evolution-4824927269ed26278e9cddc9d523ad813d0fd626.zip
Put the dont-try-to-get-mail-from-imap-sources check into a better spot
svn path=/trunk/; revision=4750
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-ops.c7
-rw-r--r--mail/mail-tools.c5
3 files changed, 14 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6096db8f28..34d7756c07 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-11 Peter Williams <peterw@helixcode.com>
+
+ * mail-tools.c (mail_tool_fetch_mail_into_searchable): Don't
+ do the imap check here... it's a silly place.
+
+ * mail-ops.c (do_fetch_mail): Do the imap check here.
+
2000-08-11 JP Rosevear <jpr@helixcode.com>
* mail-config-gui.c (service_page_new): Work around
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 06d49d42c9..ce99a75dad 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -110,6 +110,13 @@ do_fetch_mail (gpointer in_data, gpointer op_data, CamelException * ex)
CamelFolder *search_folder = NULL;
+ /* If using IMAP, don't do anything... */
+
+ if (!strncmp (input->source_url, "imap:", 5)) {
+ data->empty = FALSE;
+ return;
+ }
+
if (input->destination == NULL) {
input->destination = mail_tool_get_local_inbox (ex);
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index aa768c6def..d335416885 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -447,11 +447,6 @@ mail_tool_fetch_mail_into_searchable (const char *source_url, gboolean keep_on_s
CamelFolder *search_folder = NULL;
CamelFolder *spool_folder = NULL;
- /* If using IMAP, don't do anything... */
-
- if (!strncmp (source_url, "imap:", 5))
- return NULL;
-
/* If fetching mail from an mbox store, safely copy it to a
* temporary store first.
*/