Changeset 1485

Timestamp:

01/27/07 17:57:13

Author:

pvanhoof

Message:

Changed some things about connecting

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-account-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (15 diffs)
• trunk/libtinymail-camel/tny-camel-account.h (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (5 diffs)
• trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c (modified) (2 diffs)
• trunk/libtinymail-gpe/tny-gpe-account-store.c (modified) (2 diffs)
• trunk/libtinymail-maemo/tny-maemo-account-store.c (modified) (2 diffs)
• trunk/libtinymail-olpc/tny-olpc-account-store.c (modified) (4 diffs)
• trunk/libtinymail/tny-account.c (modified) (3 diffs)
• trunk/libtinymail/tny-account.h (modified) (4 diffs)
• trunk/libtinymail/tny-error.c (modified) (2 diffs)
• trunk/libtinymail/tny-error.h (modified) (2 diffs)
• trunk/tinymail/tny-demoui-summary-view.c (modified) (9 diffs)

trunk/ChangeLog

@@ -9 +9 @@
-        * First LEMONADE feature, implemented support for the CONDSTORE 
-        capability in camel-lite's IMAP provider (RFC 4551)
+        * Changed some things about connecting, including the introduction of
+        a new api tny_account_try_connect. All this connecting stuff is yet
+        uncertain though.
+
+        * This was a major API change
-
-2007-01-26  Philip Van Hoof  <pvanhoof@gnome.org>

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

@@ -2345 +2345 @@
-        int retry;
-
-        /* TNY TODO: Implement partial message retrieval if full==TRUE */
-
-        mi = (CamelImapMessageInfo *)camel_folder_summary_uid (folder->summary, uid);
-        if (mi == NULL) {
@@ -2358 +2356 @@
-        if ( (stream = camel_imap_folder_fetch_data (imap_folder, uid, "", TRUE, type, param, NULL))
-             && (msg = get_message_simple(imap_folder, uid, stream, type, param, ex)))
+                goto done;
+
+
+        if (camel_disco_store_status (CAMEL_DISCO_STORE (folder->parent_store)) == CAMEL_DISCO_STORE_OFFLINE)
-                goto done;
-
@@ -2446 +2448 @@
-                 && camel_exception_get_id(ex) == CAMEL_EXCEPTION_SERVICE_UNAVAILABLE);
-
-
-
-
+
+
-fail:
-        camel_message_info_free(&mi->info);

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

@@ -40 +40 @@
-        gboolean connected, inuse_spin;
-        gchar *name; GList *options;
-
+ gint port;
-        TnyAccountType account_type;
-};

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

@@ -89 +89 @@
-        priv->options = g_list_prepend (priv->options, g_strdup (option));
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return;
@@ -111 +125 @@
-        priv->url_string = g_strdup (url_string);
-
-
-
-
-
+
-
-        return;
@@ -279 +290 @@
-        g_static_rec_mutex_lock (priv->service_lock);
-        priv->session = session;
-        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->reconnect_func (self);
-        _tny_session_camel_add_account (session, self);
+
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->prepare_func (self);
+
-        g_static_rec_mutex_unlock (priv->service_lock);
-
@@ -323 +336 @@
-        priv->mech = g_strdup (mech);
-
-reconnect
-
+prepare
+
-        g_static_rec_mutex_unlock (priv->service_lock);
-
@@ -348 +361 @@
-        priv->proto = g_strdup (proto);
-
-reconnect
-
+prepare
+
-        g_static_rec_mutex_unlock (priv->service_lock);
-
@@ -373 +386 @@
-        priv->user = g_strdup (user);
-
-reconnect
+prepare
-
-        g_static_rec_mutex_unlock (priv->service_lock);
@@ -398 +411 @@
-        priv->host = g_strdup (host);
-
-reconnect
+prepare
-
-        g_static_rec_mutex_unlock (priv->service_lock);
@@ -404 +417 @@
-        return;
-}
+
+
+
+static void
+tny_camel_account_set_port (TnyAccount *self, guint port)
+{
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_port_func (self, port);
+}
+
+static void
+tny_camel_account_set_port_default (TnyAccount *self, guint port)
+{
+        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
+        
+        g_static_rec_mutex_lock (priv->service_lock);
+
+        priv->port = (gint) port;
+
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->prepare_func (TNY_CAMEL_ACCOUNT (self));
+
+        g_static_rec_mutex_unlock (priv->service_lock);
+
+        return;
+}
+
-
-static void
@@ -422 +460 @@
-        priv->pass_func_set = TRUE;
-
-
-
-
-
+
-
-        g_static_rec_mutex_unlock (priv->service_lock);
@@ -449 +484 @@
-        priv->forget_pass_func_set = TRUE;
-
+        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->prepare_func (TNY_CAMEL_ACCOUNT (self));
+
-        g_static_rec_mutex_unlock (priv->service_lock);
-
@@ -531 +568 @@
-tny_camel_account_get_hostname_default (TnyAccount *self)
-{
-      
+
-        const gchar *retval;
-
@@ -537 +574 @@
-
-        return retval;
+}
+
+
+
+static guint 
+tny_camel_account_get_port (TnyAccount *self)
+{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_port_func (self);
+}
+
+static guint 
+tny_camel_account_get_port_default (TnyAccount *self)
+{
+        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
+        return (guint)priv->port;
-}
-
@@ -602 +654 @@
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
+        priv->port = -1;
-        priv->cache_location = NULL;
-        priv->service = NULL;
@@ -767 +820 @@
-        TnyAccountIface *klass = (TnyAccountIface *)g;
-
+        klass->try_connect_func = tny_camel_account_try_connect;
+        klass->get_port_func = tny_camel_account_get_port;
+        klass->set_port_func = tny_camel_account_set_port;
-        klass->get_hostname_func = tny_camel_account_get_hostname;
-        klass->set_hostname_func = tny_camel_account_set_hostname;
@@ -799 +855 @@
-        object_class = (GObjectClass*) class;
-
-
+
+
+
-        class->get_hostname_func = tny_camel_account_get_hostname_default;
-        class->set_hostname_func = tny_camel_account_set_hostname_default;

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

@@ -49 +49 @@
-        GObjectClass parent;
-
-        /* This is an abstract method (it's not implemented by 
-           TnyCamelAccount, it's also not virtual) */
-
-        void (*reconnect_func) (TnyCamelAccount *self);
-
-        /* Virtual methods */
-
-        gboolean (*is_connected_func)(TnyAccount *self);
-        void (*set_id_func) (TnyAccount *self, const gchar *id);
@@ -63 +57 @@
-        void (*set_user_func) (TnyAccount *self, const gchar *user);
-        void (*set_hostname_func) (TnyAccount *self, const gchar *host);
+        void (*set_port_func) (TnyAccount *self, guint port);
-        void (*set_url_string_func) (TnyAccount *self, const gchar *url_string);
-        void (*set_pass_func_func) (TnyAccount *self, TnyGetPassFunc get_pass_func);
@@ -74 +69 @@
-        const gchar* (*get_user_func) (TnyAccount *self);
-        const gchar* (*get_hostname_func) (TnyAccount *self);
+        guint (*get_port_func) (TnyAccount *self);
-        const gchar* (*get_url_string_func) (TnyAccount *self);
-        TnyAccountType (*get_account_type_func) (TnyAccount *self);
+        void (*try_connect_func) (TnyAccount *self, GError **err);
-
-        void (*add_option_func) (TnyCamelAccount *self, const gchar *option);
-        void (*set_online_status_func) (TnyCamelAccount *self, gboolean offline);
-
+        /* Abstract methods */
+        void (*prepare_func) (TnyCamelAccount *self);
-};
-

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

@@ -54 +54 @@
-static GObjectClass *parent_class = NULL;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                return;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                apriv->service = camel_session_get_service
-                        ((CamelSession*) apriv->session, apriv->url_string, 
-                        apriv->type, apriv->ex);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        camel_exception_clear (apriv->ex);
-                } else {
+                        g_set_error (err, TNY_ACCOUNT_ERROR, 
+                                TNY_ACCOUNT_ERROR_TRY_CONNECT,
+                                _("Account not yet fully configured"));
+                }
+
+                return;
+        }
+
+        if (apriv->pass_func_set && apriv->forget_pass_func_set)
+        {
+                CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+                apriv->connected = FALSE;
+
+                if (camel_exception_is_set (apriv->ex))
+                        camel_exception_clear (apriv->ex);
+
+                g_static_rec_mutex_lock (apriv->service_lock);
+
+                /* camel_service_connect can launch GUI things */
+                if (!camel_service_connect (apriv->service, &ex))
+                {
+                        if (camel_exception_is_set (&ex))
+                        {
+                                g_set_error (err, TNY_ACCOUNT_ERROR, 
+                                        TNY_ACCOUNT_ERROR_TRY_CONNECT,
+                                        camel_exception_get_description (&ex));
+                                camel_exception_clear (&ex);
+                        } else {
+                                g_set_error (err, TNY_ACCOUNT_ERROR, 
+                                        TNY_ACCOUNT_ERROR_TRY_CONNECT,
+                                        _("Unknown error while connecting"));
+                        }
+                } else {
-                        apriv->connected = TRUE;
+                        /* tny_camel_account_set_online_status (self, !apriv->connected); */
-                }
+
-                g_static_rec_mutex_unlock (apriv->service_lock);
-
-
+
+
+
+
+
-        }
-
@@ -704 +721 @@
-        object_class->finalize = tny_camel_store_account_finalize;
-
-
+
+
-
-        class->get_folders_async_func = tny_camel_store_account_get_folders_async_default;
@@ -710 +728 @@
-        class->create_folder_func = tny_camel_store_account_create_folder_default;
-        class->remove_folder_func = tny_camel_store_account_remove_folder_default;
-
+
-        g_type_class_add_private (object_class, sizeof (TnyCamelStoreAccountPriv));
-
@@ -758 +776 @@
-                  NULL          /* interface_data */
-                };
-
+
-                type = g_type_register_static (TNY_TYPE_CAMEL_ACCOUNT,
-                        "TnyCamelStoreAccount",
-                        &info, 0);
-
-       
+       
-                        &tny_folder_store_info);  
-
-                g_type_add_interface_static (type, TNY_TYPE_STORE_ACCOUNT, 
-                        &tny_store_account_info);
-
-
+
-        }
-

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

@@ -55 +55 @@
-
-static void 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        } else {
-
-
+
+
+
-                        }
-
-
-
-
+
+
+
-                }
-
-                if (G_LIKELY (apriv->url_string))
-                        g_free (apriv->url_string);
-
-                apriv->url_string = camel_url_to_string (url, 0);
-                camel_url_free (url);
-
-
-                /* TODO: check for old instance and clear it */
-                g_static_rec_mutex_lock (apriv->service_lock);
-                /* camel_session_get_service can launch GUI things */
-                apriv->service = camel_session_get_service
-                        ((CamelSession*) apriv->session, apriv->url_string, 
-                        apriv->type, &ex);
-                /* TODO: check ex and handle it with a GError */
-                if (camel_exception_is_set (&ex))
-                        g_error ("Can't get service for transport account (%s)\n", 
-                                         camel_exception_get_description (&ex));
-                g_static_rec_mutex_unlock (apriv->service_lock);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -157 +214 @@
-        transport = (CamelTransport *) apriv->service;
-        g_assert (CAMEL_IS_TRANSPORT (transport));
+
+        /* TODO: Why not simply use tny_account_try_connect here ? */
-
-        g_static_rec_mutex_lock (apriv->service_lock);
@@ -279 +338 @@
-        object_class->finalize = tny_camel_transport_account_finalize;
-
-reconnect_func = tny_camel_transport_account_re
+try_connect_func = tny_camel_transport_account_try_
-
-        g_type_class_add_private (object_class, sizeof (TnyCamelTransportAccountPriv));

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

@@ -36 +36 @@
-
-#include <tny-session-camel.h>
+#include <tny-account.h>
-
-#include <tny-device.h>
@@ -711 +712 @@
-}
-
-static void
-foreach_account_set_connectivity (gpointer data, gpointer udata)
-{
-        gboolean online = (gboolean)udata;
-        if (data && TNY_IS_CAMEL_ACCOUNT (data))
-                tny_camel_account_set_online_status (TNY_CAMEL_ACCOUNT (data), !online);
-}
-
-
-typedef struct
-{
@@ -727 +719 @@
-} BackgroundConnectInfo;
-
+static void
+foreach_account_set_connectivity (gpointer data, gpointer udata)
+{
+        BackgroundConnectInfo *info = udata;
+        gboolean online = (gboolean)udata;
+        CamelSession *session = info->user_data;
+
+        if (data && TNY_IS_CAMEL_ACCOUNT (data))
+        {
+                GError *err = NULL;
+
+                tny_account_try_connect (TNY_ACCOUNT (data), &err);
+                if (err == NULL)
+                        tny_camel_account_set_online_status (TNY_CAMEL_ACCOUNT (data), !online);
+                else 
+                        tny_session_camel_alert_user (session, CAMEL_SESSION_ALERT_ERROR, err->message, FALSE);
+        }
+}
+
-
-static void
@@ -764 +775 @@
-        {
-                g_list_foreach (priv->current_accounts, 
-(gpointer) info->online
+info
-        }
-
@@ -809 +820 @@
-        return;
-}
+
-
-/**

trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c

@@ -349 +349 @@
-{
-        TnyGnomeAccountStorePriv *priv = TNY_GNOME_ACCOUNT_STORE_GET_PRIVATE (self);
-
+, port
-
-        g_assert (TNY_IS_LIST (list));
@@ -471 +471 @@
-                                tny_account_set_hostname (TNY_ACCOUNT (account), 
-                                        hostname);
-
+
+
+
+
+
+
+
+
-                                g_free (hostname); g_free (user);
-                        } else {

trunk/libtinymail-gpe/tny-gpe-account-store.c

@@ -229 +229 @@
-{
-        TnyGpeAccountStorePriv *priv = TNY_GPE_ACCOUNT_STORE_GET_PRIVATE (self);
-
+, port
-
-        g_assert (TNY_IS_LIST (list));
@@ -350 +350 @@
-                                tny_account_set_hostname (TNY_ACCOUNT (account), 
-                                        hostname);
-
+
+
+
+
+
+
+
+
-                                g_free (hostname); g_free (user);
-                        } else {