aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-remote-store.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-01-10 06:25:50 +0800
committerDan Winship <danw@src.gnome.org>2001-01-10 06:25:50 +0800
commit461e7fcb4f4a09d88c750ad61a3fd3011debbc7c (patch)
treeaecdb30ab07914a0572bd28daed2a48dd66fe961 /camel/camel-remote-store.c
parent3c979919b1c8045827767b3e4fa3269cffb87b83 (diff)
downloadgsoc2013-evolution-461e7fcb4f4a09d88c750ad61a3fd3011debbc7c.tar.gz
gsoc2013-evolution-461e7fcb4f4a09d88c750ad61a3fd3011debbc7c.tar.zst
gsoc2013-evolution-461e7fcb4f4a09d88c750ad61a3fd3011debbc7c.zip
Mostly IMAP changes. Use the NAMESPACE extension (where
available). Deal with servers that don't return LIST flags in response to LSUB (like UW) to get rid of the "not a selectable folder" error messages in the UI. Take advantage of the \Marked and \Unmarked flags to try to speed up the folder scan by not doing STATUS on unmarked folders. Some further tweaks on the shape of the resulting folder tree in various situations... * camel-store.h: Remove the (read) message_count, since nothing uses it, and we can speed up IMAP a bit this way. * camel-store.c (camel_folder_info_build): Redo this a bit to make it more useful for IMAP since that's the only thing that uses it. * camel-remote-store.c (camel_remote_store_connected): Public function to check if the store is connected, and try to connect it if it's not. (remote_send_string, remote_send_stream, remote_recv_line): Use that. * providers/imap/camel-imap-store.c (camel_imap_store_finalize): fix up for changes. (camel_imap_store_init): Initialize subscribed_folders to NULL rather than an empty hash table. (imap_connect): Get the list of subscribed folders here. If the server doesn't claim that any of them are either Marked or Unmarked, then assume that it doesn't do that for LSUB and remember that for later. If the server supports the NAMESPACE extension and the user didn't specify a namespace, use the server-provided one. (imap_disconnect): Free the list of subscribed folders, and the namespace. (get_folder): check camel_remote_store_connected (get_folder_info): check camel_remote_store_connected. Add a bunch of new cleverness. If we learned that the server doesn't do LSUB usefully, do a bunch of LISTs by hand. Then, if we're getting unread counts, only do it for folders that weren't listed as Unmarked. Also, deal with namespaces that end with the separator character, and update for changes to camel_folder_info_build. (folder_subscribed): Add a g_return_val_if_fail. (subscribe_folder, unsubscribe_folder): check camel_remote_store_connected. * providers/nntp/camel-nntp-store.c (build_folder_info, build_folder_info_from_grouplist, nntp_store_get_folder_info): Don't fill in message_count since it doesn't exist any more. svn path=/trunk/; revision=7343
Diffstat (limited to 'camel/camel-remote-store.c')
-rw-r--r--camel/camel-remote-store.c50
1 files changed, 27 insertions, 23 deletions
diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c
index 70b34ec1f2..8d095244e2 100644
--- a/camel/camel-remote-store.c
+++ b/camel/camel-remote-store.c
@@ -304,13 +304,8 @@ remote_send_string (CamelRemoteStore *store, CamelException *ex, char *fmt, va_l
/* Check for connectedness. Failed (or cancelled) operations will
* close the connection. */
-
- if (store->ostream == NULL) {
- d(g_message ("remote: (send) disconnected, reconnecting."));
-
- if (!camel_service_connect (CAMEL_SERVICE (store), ex))
- return -1;
- }
+ if (!camel_remote_store_connected (store, ex))
+ return -1;
/* create the command */
cmdbuf = g_strdup_vprintf (fmt, ap);
@@ -380,12 +375,8 @@ remote_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException
/* Check for connectedness. Failed (or cancelled) operations will
* close the connection. */
- if (store->ostream == NULL) {
- d(g_message ("remote: (sendstream) disconnected, reconnecting."));
-
- if (!camel_service_connect (CAMEL_SERVICE (store), ex))
- return -1;
- }
+ if (!camel_remote_store_connected (store, ex))
+ return -1;
d(fprintf (stderr, "(sending stream)\n"));
@@ -442,18 +433,12 @@ remote_recv_line (CamelRemoteStore *store, char **dest, CamelException *ex)
* meaning if we reconnect, so always set an exception.
*/
- if (store->istream == NULL) {
- g_message ("remote: (recv) disconnected, reconnecting.");
-
- camel_service_connect (CAMEL_SERVICE (store), ex);
-
- if (!camel_exception_is_set (ex))
- camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,
- g_strerror (errno));
-
+ if (!camel_remote_store_connected (store, ex)) {
+ camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,
+ g_strerror (errno));
return -1;
}
-
+
bytes = g_byte_array_new ();
do {
@@ -547,3 +532,22 @@ camel_remote_store_refresh_folders (CamelRemoteStore *store, CamelException *ex)
CAMEL_STORE_UNLOCK(store, cache_lock);
}
+
+/**
+ * camel_remote_store_connected:
+ * @store: a CamelRemoteStore
+ * @ex: a CamelException
+ *
+ * Ensure that the remote store is connected.
+ *
+ * Return value: Whether or not it is connected
+ **/
+gboolean
+camel_remote_store_connected (CamelRemoteStore *store, CamelException *ex)
+{
+ if (store->istream == NULL) {
+ camel_service_connect (CAMEL_SERVICE (store), ex);
+ return !camel_exception_is_set (ex);
+ }
+ return TRUE;
+}