Changeset 1305

Timestamp:

12/08/06 13:52:19

Author:

pvanhoof

Message:

Bleh, small bugfixes but still a stinky solution

Files:

• trunk/libtinymail-camel/tny-camel-account.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (3 diffs)
• trunk/tinymail/tny-demoui-summary-view.c (modified) (2 diffs)

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

@@ -160 +160 @@
-        GThread *thread;
-
-      
+
-
-        /* I know this isn't polite. But it works ;-) */
@@ -260 +260 @@
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
+
-        g_static_rec_mutex_lock (priv->service_lock);
-
@@ -499 +499 @@
-        if (!priv->service)
-                return;
-
+
-        _tny_camel_account_start_camel_operation (self, NULL, NULL, NULL);
-
+
+
+
-        if (offline)
-                camel_service_cancel_connect (priv->service);
@@ -537 +539 @@
-                                                                  TRUE, priv->ex);
-        done:
-
+g_static_rec_mutex_unlock (priv->service_lock);
-                _tny_camel_account_stop_camel_operation (self);
-        
@@ -546 +548 @@
-tny_camel_account_finalize (GObject *object)
-{
-     
+
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-

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

@@ -74 +74 @@
-tny_camel_store_account_reconnect (TnyCamelAccount *self)
-{
-
-
-priv->session) && G_UNLIKELY (
-priv->user) && G_UNLIKELY (
-
-
+a
+
+apriv->session) && G_UNLIKELY (a
+apriv->user) && G_UNLIKELY (a
+
+a
-                {
-                        CamelURL *url = NULL;
-
-
-
-
-
+
+
+
+
-                        g_free (proto);
-
-
-
-
-
+
+a
+a
+a
+
-                        while (options)
-                        {
-                                gchar *ptr, *dup = g_strdup (options->data);
-                                gchar *option, *value;
-
-                                ptr = strchr (dup, '=');
-
-
-
+
-                                        ptr++;
-                                        value = g_strdup (ptr); ptr--;
@@ -109 +105 @@
-                                        value = g_strdup ("1");
-                                }
-
-                                camel_url_set_param (url, option, value);
-
-                                g_free (value);
-
-                                g_free (dup);
-
-                                options = g_list_next (options);
-                        }
-
-
-
-
-
-
+
+
+
+
-                        camel_url_free (url);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
-
+a
-                }
+                g_static_rec_mutex_unlock (apriv->service_lock);
+                
+                /* TODO: Handle priv->ex using GError */
-        }
-

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

@@ -57 +57 @@
-tny_camel_transport_account_reconnect (TnyCamelAccount *self)
-{
-
-
-
-
-
+
+
+
+
-        {
-                GString *urlstr = g_string_new ("");
-
-
-
-
-
+a
+a
+
+a
-                urlstr = g_string_append (urlstr, "://");
-
-
+a
-                {
-
+a
-                        urlstr = g_string_append (urlstr, "@");
-                }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                /* TODO: check ex and handle it with a GError */
-priv->
+&
-                        g_error ("Can't get service for transport account (%s)\n", 
-
-
-
-
-
-
-
-
-
+
+
+
-                g_string_free (urlstr, FALSE);
-
-
-
-
+
+
+
-                /* TODO: check for old instance and clear it */
-
-
-
-
-
-
+
+
+
+
+
+
+
-                        g_error ("Can't get service for transport account (%s)\n", 
-
-
-
-
-
-
-
-
-
+
+
-        }
-}
@@ -137 +125 @@
-        TnyHeader *header; CamelMimeMessage *message;
-        CamelException ex =  CAMEL_EXCEPTION_INITIALISER;
-
-
+
-        CamelInternetAddress *from, *recipients;
-
-        g_assert (TNY_IS_CAMEL_MSG (msg));
-        g_assert (CAMEL_IS_SESSION (apriv->session));
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                if (camel_exception_is_set (&ex))
-
+
+
+
-                                camel_exception_get_description (&ex));
-
-
-
-
-
-
-
-
+
+
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        header = tny_msg_get_header (msg);

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

@@ -203 +203 @@
-}
-
+
+/* Will be called at camel_service_connect in case the account needs a password.
+   its implementation can contani GUI things. */
-static char *
-tny_session_camel_get_password (CamelSession *session, CamelService *service, const char *domain,
@@ -256 +259 @@
-}
-
+
+/* Will be called at camel_service_connect in case the entered password was wrong */
-static void
-tny_session_camel_forget_password (CamelSession *session, CamelService *service, const char *domain, const char *item, CamelException *ex)
@@ -283 +288 @@
-        return;
-}
+
+/* tny_session_camel_alert_user will for example be called when SSL is on and 
+   camel_session_get_service is issued (for example TnyCamelTransportAccount and
+   TnyCamelStore account issue this function). Its implementation is often done
+   with GUI components (it should therefore not be called from a thread). This
+   is a known issue (and the person who fixed this, please remove this warning) */
-
-static gboolean

trunk/tinymail/tny-demoui-summary-view.c

@@ -556 +556 @@
-                                {
-
-*/
+
-                                        TnyAccountStore *astore = priv->account_store;
-                                        TnyList *accs = tny_simple_list_new ();
@@ -573 +573 @@
-                                        g_object_unref (G_OBJECT (iter));
-                                        g_object_unref (G_OBJECT (accs));
-
+
-
-                                        msgwin = tny_gtk_msg_window_new (