Changeset 1498

Timestamp:

01/29/07 01:49:11

Author:

pvanhoof

Message:

Some bugfixes

Files:

• trunk/libtinymail-camel/tny-camel-account-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (7 diffs)
• trunk/libtinymail-camel/tny-camel-account.h (modified) (2 diffs)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (1 diff)
• trunk/libtinymail-olpc/tny-olpc-account-store.c (modified) (1 diff)
• trunk/libtinymail/tny-account.c (modified) (1 diff)
• trunk/libtinymail/tny-account.h (modified) (2 diffs)

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

@@ -49 +49 @@
-void _tny_camel_account_start_camel_operation (TnyCamelAccount *self, CamelOperationStatusFunc func, gpointer user_data, const gchar *what);
-void _tny_camel_account_stop_camel_operation (TnyCamelAccount *self);
+void _tny_camel_account_try_connect (TnyCamelAccount *self, GError **err);
-
-#define TNY_CAMEL_ACCOUNT_GET_PRIVATE(o)        \

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

@@ -29 +29 @@
-#include <tny-folder.h>
-#include <tny-camel-folder.h>
+#include <tny-error.h>
-
-#include <camel/camel.h>
@@ -94 +95 @@
-}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->prepare_func (TNY_CAMEL_ACCOUNT (self));
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -703 +709 @@
- **/
-void 
-
-
-
+, GError **err
+
+, err
-}
-
-void 
-
-
-
-
-
+
+
+
+
-
-        if (!priv->service || !CAMEL_IS_SERVICE (priv->service))
+        {
+                if (camel_exception_is_set (priv->ex))
+                {
+                        g_set_error (err, TNY_ACCOUNT_ERROR, 
+                                TNY_ACCOUNT_ERROR_TRY_CONNECT,
+                                camel_exception_get_description (priv->ex));
+                } else {
+                        g_set_error (err, TNY_ACCOUNT_ERROR, 
+                                TNY_ACCOUNT_ERROR_TRY_CONNECT,
+                                _("Account not yet fully configured"));
+                }
+
-                return;
-
-
-
-
+
-
-        if (offline)
-                camel_service_cancel_connect (priv->service);
-
+
-        if (CAMEL_IS_DISCO_STORE (priv->service)) {
-                if (!offline) {
-                        camel_disco_store_set_status (CAMEL_DISCO_STORE (priv->service),
-priv->
+&
-                        goto done;
-                } else if (camel_disco_store_can_work_offline (CAMEL_DISCO_STORE (priv->service))) {
@@ -734 +748 @@
-                        camel_disco_store_set_status (CAMEL_DISCO_STORE (priv->service),
-                                                                                  CAMEL_DISCO_STORE_OFFLINE,
-priv->
+&
-                        goto done;
-                }
@@ -743 +757 @@
-                        camel_offline_store_set_network_state (CAMEL_OFFLINE_STORE (priv->service),
-                                                                                                   CAMEL_OFFLINE_STORE_NETWORK_AVAIL,
-priv->
+&
-                        goto done;
-                } else {
-                        camel_offline_store_set_network_state (CAMEL_OFFLINE_STORE (priv->service),
-                                                                                                   CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL,
-priv->
+&
-                        goto done;
-                }
-        }
-
+
-        if (offline)
-                camel_service_disconnect (CAMEL_SERVICE (priv->service),
-priv->
+&
-
-done:
-
-
+
+
+
+
+
+
+
-
-        return;
@@ -835 +854 @@
-        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;
@@ -870 +888 @@
-        object_class = (GObjectClass*) class;
-
-        class->try_connect_func = tny_camel_account_try_connect_default;
-        class->get_port_func = tny_camel_account_get_port_default;
-        class->set_port_func = tny_camel_account_set_port_default;

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

@@ -75 +75 @@
-
-        void (*add_option_func) (TnyCamelAccount *self, const gchar *option);
-
+, GError **err
-
-        /* Abstract methods */
@@ -85 +85 @@
-void tny_camel_account_add_option (TnyCamelAccount *self, const gchar *option);
-void tny_camel_account_set_session (TnyCamelAccount *self, TnySessionCamel *session);
-
+, GError **err
-
-G_END_DECLS

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

@@ -559 +559 @@
-                GError *err = NULL;
-
-
+
+
-                if (err == NULL)
-
-
+
+
+
+
-                        tny_session_camel_alert_user (session, CAMEL_SESSION_ALERT_ERROR, err->message, FALSE);
+                        g_error_free (err);
+                }
-        }
-}

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

@@ -288 +288 @@
-                                        tny_account_set_port (TNY_ACCOUNT (account), port);
-
+                                if (err != NULL)
+                                        g_error_free (err);
+
-                                g_free (hostname); g_free (user);
-                        } else {

trunk/libtinymail/tny-account.c

@@ -22 +22 @@
-#include <tny-account.h>
-
-
-/**
- * tny_account_try_connect:
- * @self: a #TnyAccount object
- * @err: a #GError instance or NULL
- * 
- * Try to connect. This can put a reason why connecting failed in @err.
- **/
-void
-tny_account_try_connect (TnyAccount *self, GError **err)
-{
-#ifdef DEBUG
-        if (!TNY_ACCOUNT_GET_IFACE (self)->try_connect_func)
-                g_critical ("You must implement tny_account_get_id\n");
-#endif
-
-        return TNY_ACCOUNT_GET_IFACE (self)->try_connect_func (self, err);
-}
-
-/**

trunk/libtinymail/tny-account.h

@@ -72 +72 @@
-        const gchar* (*get_url_string_func) (TnyAccount *self);
-        TnyAccountType (*get_account_type_func) (TnyAccount *self);
-        void (*try_connect_func) (TnyAccount *self, GError **err);
-};
-
@@ -100 +99 @@
-void tny_account_set_forget_pass_func (TnyAccount *self, TnyForgetPassFunc forget_pass_func);
-TnyForgetPassFunc tny_account_get_forget_pass_func (TnyAccount *self);
-void tny_account_try_connect (TnyAccount *self, GError **err);
-
-G_END_DECLS