Changeset 1368

Timestamp:

01/08/07 16:48:31

Author:

pvanhoof

Message:

Implemented partial message retrieval first parts and pop support

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/Makefile.am (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (17 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.h (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-wrapper.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (21 diffs)
• trunk/libtinymail-camel/tny-camel-account.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-pop-folder.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-pop-store-account-priv.h (added)
• trunk/libtinymail-camel/tny-camel-pop-store-account.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-01-08  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Implemented first pieces of the partial message retrieval
+        * Further implemented TnyCamelPopFolder and TnyCamelPopAccount
+
-2007-01-04  Philip Van Hoof <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/Makefile.am

@@ -33 +33 @@
-
-libtinymail_camel_priv_headers = \
+        tny-camel-pop-store-account-priv.h \
-        tny-session-camel-priv.h \
-        tny-camel-common.c \

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c

@@ -136 +136 @@
-static CamelObjectClass *parent_class;
-
+
-static GData *parse_fetch_response (CamelImapFolder *imap_folder, char *msg_att);
+
+static GData *parse_partial_fetch_response (CamelImapFolder *imap_folder, char *response, GData *data, const gchar *part_spec);
-
-#ifdef G_OS_WIN32
@@ -1719 +1722 @@
-                                      const char *uid,
-                                      CamelMessageContentInfo *ci,
-
+gboolean full, 
-
-struct _part_spec_stack {
@@ -1840 +1843 @@
-                g_free(part_spec);
-                
-
+
+
-                if (stream) {
-                        ret = camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (body_mp), stream);
@@ -1877 +1881 @@
-                while (ci) {
-                        sprintf (child_spec + speclen, "%d.MIME", num++);
-
+
+
-                        if (stream) {
-                                int ret;
@@ -1933 +1938 @@
-                return (CamelDataWrapper *) body_mp;
-        } else if (camel_content_type_is (ci->type, "message", "rfc822")) {
-
+
+
-                g_free (part_spec);
-                return content;
@@ -1957 +1963 @@
-get_message (CamelImapFolder *imap_folder, const char *uid,
-             CamelMessageContentInfo *ci,
-
+gboolean full, 
-{
-        CamelImapStore *store = CAMEL_IMAP_STORE (CAMEL_FOLDER (imap_folder)->parent_store);
@@ -1971 +1977 @@
-                                        store->server_level >= IMAP_LEVEL_IMAP4REV1 ? "HEADER" : "0");
-
-
+
+
-        g_free (section_text);
-        g_free(part_spec);
@@ -2011 +2018 @@
-static CamelMimeMessage *
-get_message_simple (CamelImapFolder *imap_folder, const char *uid,
-
+gboolean full, 
-{
-        CamelMimeMessage *msg;
@@ -2018 +2025 @@
-        if (!stream) {
-                stream = camel_imap_folder_fetch_data (imap_folder, uid, "",
-
+full, 
-                if (!stream)
-                        return NULL;
@@ -2077 +2084 @@
-        /* If its cached in full, just get it as is, this is only a shortcut,
-           since we get stuff from the cache anyway.  It affects a busted connection though. */
-
-
+full, 
+full, 
-                goto done;
-
@@ -2095 +2102 @@
-#endif
-                    || (!content_info_incomplete(mi->info.content) && !mi->info.content->childs)) {
-
+full, 
-                } else {
-                        if (content_info_incomplete (mi->info.content)) {
@@ -2161 +2168 @@
-                         */
-                        if (content_info_incomplete (mi->info.content))
-
+full, 
-                        else
-
+full, 
-                }
-        } while (msg == NULL
@@ -2185 +2192 @@
-        CamelStream *stream;
-
-
+
+
-        if (stream)
-                camel_object_unref (CAMEL_OBJECT (stream));
@@ -2683 +2691 @@
-}
-
+typedef struct {
+        const gchar *part_spec;
+        GData *data;
+} PartialRetrieveInfo;
-
-CamelStream *
-camel_imap_folder_fetch_data (CamelImapFolder *imap_folder, const char *uid,
-                              const char *section_text, gboolean cache_only,
-
+gboolean full, 
-{
-        CamelFolder *folder = CAMEL_FOLDER (imap_folder);
@@ -2693 +2705 @@
-        CamelImapResponse *response;
-        CamelStream *stream;
-
-
-
+=NULL
+ = NULL, *boundary = NULL
+ gboolean free_fuid = FALSE;
-        
-        /* EXPUNGE responses have to modify the cache, which means
@@ -2709 +2721 @@
-        CAMEL_IMAP_FOLDER_REC_LOCK (imap_folder, cache_lock);
-        stream = camel_imap_message_cache_get (imap_folder->cache, uid, section_text, ex);
-
+
+
-                camel_exception_clear (ex);
-                stream = camel_imap_message_cache_get (imap_folder->cache, uid, "", ex);
@@ -2732 +2745 @@
-        
-        camel_exception_clear (ex);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                response = camel_imap_command (store, folder, ex,
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                CAMEL_IMAP_FOLDER_REC_UNLOCK (imap_folder, cache_lock);
+            } else {
+                int x=0;
+                for (x=0; x < 3; x++) 
+                        g_datalist_clear (&(infos[x].data)); 
+                goto errorh;
+            }
+
+        }
+
+errorh:
+
+        CAMEL_IMAP_FOLDER_REC_UNLOCK (imap_folder, cache_lock);
+
+        if (!stream) camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
+                    _("Could not find message body in FETCH response."));
+
+        if (free_fuid)
+                g_free (found_uid);
+
+        if (boundary)
+                g_free (boundary);
+
+        return stream;
+}
+
+
+
+static GData *
+parse_partial_fetch_response (CamelImapFolder *imap_folder, char *response, GData *data, const gchar *part_spec)
+{
+        if (*response != '(') 
+        {
+                long seq;
+                
+                if (*response != '*' || *(response + 1) != ' ')
+                        return NULL;
+                seq = strtol (response + 2, &response, 10);
+                if (seq == 0)
+                        return NULL;
+                if (g_ascii_strncasecmp (response, " FETCH (", 8) != 0)
+                        return NULL;
+                response += 7;          
+        }
+
+        do {
+                /* Skip the initial '(' or the ' ' between elements */
+                response++;
+                
+                if (!g_ascii_strncasecmp (response, "FLAGS ", 6))                       
+                        response += 6;
+                else if (!g_ascii_strncasecmp (response, "RFC822.SIZE ", 12)) 
+                { /* REMOVE THIS? */
+                        unsigned long size;
+                        response += 12;
+                        size = strtoul (response, &response, 10);
+                        g_datalist_set_data (&data, "RFC822.SIZE", GUINT_TO_POINTER (size));
+                } else if (!g_ascii_strncasecmp (response, "BODY[", 5) ||
+                           !g_ascii_strncasecmp (response, "RFC822 ", 7)) 
+                {
+                        char *body = NULL, *p = NULL, *boundary = NULL;
+                        size_t body_len = 0;
+
+                        if (*response == 'B') 
+                        {
+                                response += 5;
+                                p = strchr (response, ']');
+                                if (!p || *(p + 1) != ' ')
+                                        break;
+                                response = p + 2;
+                        } else 
+                                response += 7;
+                        
+                        body = imap_parse_nstring ((const char **) &response, &body_len);
+
+                        if (!response) break;
+                        if (!body) body = g_strdup ("");
+
+                        if (!strcmp (part_spec, "HEADER"))
+                        {
+                           CamelContentType *ct = NULL;
+                           const char *bound=NULL;
+                           char *pstr = (char*)strcasestr (body, "Content-Type:");
+
+                           if (pstr) { 
+                                pstr = strchr (pstr, ':'); 
+                                if (pstr) { pstr++;
+                                ct = camel_content_type_decode(pstr); } 
+                           }
+
+                           if (ct) { 
+                                bound = camel_content_type_param(ct, "boundary");
+                                if (bound) {
+                                        boundary = g_strdup (bound);
+                                        g_datalist_set_data_full (&data, "BOUNDARY", boundary, g_free);
+                                }
+                           }
+                        }
+
+                        g_datalist_set_data_full (&data, "PART_BODY", body, g_free);
+                        g_datalist_set_data (&data, "PART_LEN", GINT_TO_POINTER (body_len));
+
+
+                } else if (!g_ascii_strncasecmp (response, "UID ", 4)) 
+                {
+                        int len = strcspn (response + 4, " )");
+                        char *uid = g_strndup (response + 4, len);
+                        g_datalist_set_data_full (&data, "UID", uid, g_free);
+                        response += 4 + len;
+                } else {
+                        g_warning ("Unexpected FETCH response from server: (%s", response);
+                        break;
+                }
+        } while (response && *response != ')');
+        
+        if (!response || *response != ')') 
+        {
+                g_warning ("Unexpected FETCH response from server: (%s", response);
+                g_datalist_clear (&data);
-                return NULL;
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.h

@@ -81 +81 @@
-                                           const char *section_text,
-                                           gboolean cache_only,
-
+gboolean full, 
-
-/* Standard Camel function */

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

@@ -673 +673 @@
-        }
-        
+
+        /* Tinymail hack: always use IMAP4, not IMAP4rev1 (sorry) */
+
+        force_imap4 = TRUE;
+        store->braindamaged = TRUE;
+
+        /* end of hack :) */
+
-        g_free (buf);
-        

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-wrapper.c

@@ -142 +142 @@
-                CamelStream *datastream;
-                
+                /* TNY TODO: partial message retrieval exception */
-                datastream = camel_imap_folder_fetch_data (
-                        imap_wrapper->folder, imap_wrapper->uid,
-
+TRUE, 
-                if (!datastream) {
-                        CAMEL_IMAP_WRAPPER_UNLOCK (imap_wrapper, lock);
@@ -189 +190 @@
-
-        /* Try the cache. */
+        /* TNY TODO: Partial message retrieval exception */
-        stream = camel_imap_folder_fetch_data (imap_folder, uid, part_spec,
-
+TRUE, 
-        if (stream) {
-                imap_wrapper_hydrate (imap_wrapper, stream);

trunk/libtinymail-camel/tny-camel-account.c

@@ -52 +52 @@
-tny_camel_account_get_account_type (TnyAccount *self)
-{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_account_type_func (self);
+}
+
+static TnyAccountType
+tny_camel_account_get_account_type_default (TnyAccount *self)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
@@ -70 +76 @@
-tny_camel_account_add_option (TnyCamelAccount *self, const gchar *option)
-{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->add_option_func (self, option);
+}
+
+void 
+tny_camel_account_add_option_default (TnyCamelAccount *self, const gchar *option)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
@@ -82 +94 @@
-static void
-tny_camel_account_set_url_string (TnyAccount *self, const gchar *url_string)
+{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_url_string_func (self, url_string);
+}
+
+static void
+tny_camel_account_set_url_string_default (TnyAccount *self, const gchar *url_string)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -101 +119 @@
-tny_camel_account_get_url_string (TnyAccount *self)
-{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_url_string_func (self);
+}
+
+static const gchar*
+tny_camel_account_get_url_string_default (TnyAccount *self)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
@@ -109 +133 @@
-static void
-tny_camel_account_set_name (TnyAccount *self, const gchar *name)
+{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_name_func (self, name);
+}
+
+static void
+tny_camel_account_set_name_default (TnyAccount *self, const gchar *name)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -122 +152 @@
-static const gchar*
-tny_camel_account_get_name (TnyAccount *self)
+{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_name_func (self);
+}
+
+static const gchar*
+tny_camel_account_get_name_default (TnyAccount *self)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -212 +248 @@
-tny_camel_account_is_connected (TnyAccount *self)
-{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->is_connected_func (self);
+}
+
+static gboolean 
+tny_camel_account_is_connected_default (TnyAccount *self)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        return priv->connected;
@@ -238 +280 @@
-}
-
-
-static void
-tny_camel_account_set_id (TnyAccount *self, const gchar *id)
+{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_id_func (self, id);
+}
+
+static void
+tny_camel_account_set_id_default (TnyAccount *self, const gchar *id)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -259 +306 @@
-tny_camel_account_set_proto (TnyAccount *self, const gchar *proto)
-{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_proto_func (self, proto);
+}
+
+static void
+tny_camel_account_set_proto_default (TnyAccount *self, const gchar *proto)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
@@ -278 +331 @@
-tny_camel_account_set_user (TnyAccount *self, const gchar *user)
-{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_user_func (self, user);
+}
+
+static void
+tny_camel_account_set_user_default (TnyAccount *self, const gchar *user)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        
@@ -297 +356 @@
-tny_camel_account_set_hostname (TnyAccount *self, const gchar *host)
-{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_hostname_func (self, host);
+}
+
+static void
+tny_camel_account_set_hostname_default (TnyAccount *self, const gchar *host)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        
@@ -315 +380 @@
-static void
-tny_camel_account_set_pass_func (TnyAccount *self, TnyGetPassFunc get_pass_func)
+{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_pass_func_func (self, get_pass_func);
+}
+
+static void
+tny_camel_account_set_pass_func_default (TnyAccount *self, TnyGetPassFunc get_pass_func)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -337 +408 @@
-tny_camel_account_set_forget_pass_func (TnyAccount *self, TnyForgetPassFunc get_forget_pass_func)
-{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_forget_pass_func_func (self, get_forget_pass_func);
+}
+
+static void
+tny_camel_account_set_forget_pass_func_default (TnyAccount *self, TnyForgetPassFunc get_forget_pass_func)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
@@ -353 +430 @@
-tny_camel_account_get_id (TnyAccount *self)
-{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_id_func (self);
+}
+
+static const gchar*
+tny_camel_account_get_id_default (TnyAccount *self)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);       
-        const gchar *retval;
@@ -366 +449 @@
-tny_camel_account_get_proto (TnyAccount *self)
-{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_proto_func (self);
+}
+
+static const gchar*
+tny_camel_account_get_proto_default (TnyAccount *self)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        const gchar *retval;
@@ -379 +468 @@
-tny_camel_account_get_user (TnyAccount *self)
-{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_user_func (self);
+}
+
+static const gchar*
+tny_camel_account_get_user_default (TnyAccount *self)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        const gchar *retval;
@@ -391 +486 @@
-static const gchar*
-tny_camel_account_get_hostname (TnyAccount *self)
+{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_hostname_func (self);
+}
+
+static const gchar*
+tny_camel_account_get_hostname_default (TnyAccount *self)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);       
@@ -405 +506 @@
-tny_camel_account_get_pass_func (TnyAccount *self)
-{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_pass_func_func (self);
+}
+
+static TnyGetPassFunc
+tny_camel_account_get_pass_func_default (TnyAccount *self)
+{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        TnyGetPassFunc retval;
@@ -417 +524 @@
-static TnyForgetPassFunc
-tny_camel_account_get_forget_pass_func (TnyAccount *self)
+{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_forget_pass_func_func (self);
+}
+
+static TnyForgetPassFunc
+tny_camel_account_get_forget_pass_func_default (TnyAccount *self)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -492 +605 @@
-void 
-tny_camel_account_set_online_status (TnyCamelAccount *self, gboolean offline)
+{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_online_status_func (self, offline);
+}
+
+void 
+tny_camel_account_set_online_status_default (TnyCamelAccount *self, gboolean offline)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -636 +755 @@
-        object_class = (GObjectClass*) class;
-
+
+        class->get_hostname_func = tny_camel_account_get_hostname_default;
+        class->set_hostname_func = tny_camel_account_set_hostname_default;
+        class->get_proto_func = tny_camel_account_get_proto_default;
+        class->set_proto_func = tny_camel_account_set_proto_default;
+        class->get_user_func = tny_camel_account_get_user_default;
+        class->set_user_func = tny_camel_account_set_user_default;
+        class->get_pass_func_func = tny_camel_account_get_pass_func_default;
+        class->set_pass_func_func = tny_camel_account_set_pass_func_default;
+        class->get_forget_pass_func_func = tny_camel_account_get_forget_pass_func_default;
+        class->set_forget_pass_func_func = tny_camel_account_set_forget_pass_func_default;
+        class->set_id_func = tny_camel_account_set_id_default;
+        class->get_id_func = tny_camel_account_get_id_default;
+        class->is_connected_func = tny_camel_account_is_connected_default;
+        class->set_url_string_func = tny_camel_account_set_url_string_default;
+        class->get_url_string_func = tny_camel_account_get_url_string_default;
+        class->get_name_func = tny_camel_account_get_name_default;
+        class->set_name_func = tny_camel_account_set_name_default;
+        class->get_account_type_func = tny_camel_account_get_account_type_default;
+
+        class->add_option_func = tny_camel_account_add_option_default;
+        class->set_online_status_func = tny_camel_account_set_online_status_default;
+
-        object_class->finalize = tny_camel_account_finalize;
-

trunk/libtinymail-camel/tny-camel-account.h

@@ -53 +53 @@
-
-        void (*reconnect_func) (TnyCamelAccount *self);
+
+        /* Virtual methods */
+
+        gboolean (*is_connected_func)(TnyAccount *self);
+        void (*set_id_func) (TnyAccount *self, const gchar *id);
+        void (*set_name_func) (TnyAccount *self, const gchar *name);
+        void (*set_proto_func) (TnyAccount *self, const gchar *proto);
+        void (*set_user_func) (TnyAccount *self, const gchar *user);
+        void (*set_hostname_func) (TnyAccount *self, const gchar *host);
+        void (*set_url_string_func) (TnyAccount *self, const gchar *url_string);
+        void (*set_pass_func_func) (TnyAccount *self, TnyGetPassFunc get_pass_func);
+        void (*set_forget_pass_func_func) (TnyAccount *self, TnyForgetPassFunc get_forget_pass_func);
+        TnyGetPassFunc (*get_pass_func_func) (TnyAccount *self);
+        TnyForgetPassFunc (*get_forget_pass_func_func) (TnyAccount *self);
+        const gchar* (*get_id_func) (TnyAccount *self);
+        const gchar* (*get_name_func) (TnyAccount *self);
+        const gchar* (*get_proto_func) (TnyAccount *self);
+        const gchar* (*get_user_func) (TnyAccount *self);
+        const gchar* (*get_hostname_func) (TnyAccount *self);
+        const gchar* (*get_url_string_func) (TnyAccount *self);
+        TnyAccountType (*get_account_type_func) (TnyAccount *self);
+
+        void (*add_option_func) (TnyCamelAccount *self, const gchar *option);
+        void (*set_online_status_func) (TnyCamelAccount *self, gboolean offline);
+
-};
-

trunk/libtinymail-camel/tny-camel-folder-priv.h

@@ -65 +65 @@
-void _tny_camel_folder_set_iter (TnyCamelFolder *folder, CamelFolderInfo *iter);
-void _tny_camel_folder_set_account (TnyCamelFolder *self, TnyAccount *account);
-
+
-void _tny_camel_folder_set_folder (TnyCamelFolder *self, CamelFolder *camel_folder);
-

trunk/libtinymail-camel/tny-camel-folder.c

@@ -220 +220 @@
-        
-        return TRUE;
+}
+
+gboolean 
+_tny_camel_folder_load_folder_no_lock (TnyCamelFolderPriv *priv)
+{
+        return load_folder_no_lock (priv);
-}
-
@@ -2319 +2325 @@
-
-        priv->remove_strat = tny_camel_msg_remove_strategy_new ();
-ful
+partia
-
-        return;

trunk/libtinymail-camel/tny-camel-pop-folder.c

@@ -18 +18 @@
- */
-
-/* TODO: Refactor to a TnyPOPStoreAccount, TnyPOPStoreAccount and 
-TnyNNTPStoreAccount. Maybe also add a TnyExchangeStoreAccount? This file can 
-stay as an abstract TnyStoreAccount type. */
-
-#include <config.h>
@@ -38 +35 @@
-
-#include <tny-folder.h>
+#include <tny-camel-pop-store-account.h>
-
-#include "tny-camel-account-priv.h"