Changeset 1304

Timestamp:

12/08/06 12:44:29

Author:

pvanhoof

Message:

Committing piece of shit solution for now

Files:

• trunk/libtinymail-camel/tny-camel-account.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c (modified) (7 diffs)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (2 diffs)
• trunk/tinymail/tny-demoui-summary-view.c (modified) (2 diffs)

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

@@ -90 +90 @@
-        priv->url_string = g_strdup (url_string);
-
-
+
+
+
+
-
-        return;

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

@@ -126 +126 @@
-                        camel_url_free (url);
-
+                        /* TODO: lock ->service */
-                        priv->service = camel_session_get_service
-                                ((CamelSession*) priv->session, priv->url_string, 
-                                priv->type, priv->ex);
-
+                        /* TODO: lock ->service */
-                        if (priv->service == NULL)
-                                report_error (priv);
@@ -137 +139 @@
-                /* un officially supported provider */
-
+                /* TODO: lock ->service */
-                priv->service = camel_session_get_service
-                        ((CamelSession*) priv->session, priv->url_string, 
-                        priv->type, priv->ex);
-
+                /* TODO: lock ->service */
-                if (priv->service == NULL)
-                        report_error (priv);

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

@@ -21 +21 @@
-
-#include <glib.h>
+#include <glib/gi18n-lib.h>
-
-#include <string.h>
@@ -58 +59 @@
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
+        printf ("recon\n");
+
-        if (G_LIKELY (priv->session) && G_UNLIKELY (priv->proto) && G_UNLIKELY (priv->host))
-        {
@@ -78 +81 @@
-                priv->url_string = urlstr->str;
-
+                /* TODO: lock ->service */
+                priv->service = camel_session_get_service
+                        ((CamelSession*) priv->session, priv->url_string, 
+                        priv->type, priv->ex);
+                /* TODO: check ex and handle it with a GError */
+                if (camel_exception_is_set (priv->ex))
+                        g_error ("Can't get service for transport account (%s)\n", 
+                                         camel_exception_get_description (priv->ex));
+
+                if (!camel_service_connect (priv->service, priv->ex))
+                {
+                        g_warning (_("Not connected with %s: %s\n"), priv->url_string,
+                                   camel_exception_get_description (priv->ex));
+                        camel_exception_clear (priv->ex);
+                }
+        
-                g_string_free (urlstr, FALSE);
+        } else if (priv->url_string)
+        {
+                
+                /* TODO: lock ->service */
+                /* TODO: check for old instance and clear it */
+
+                priv->service = camel_session_get_service
+                        ((CamelSession*) priv->session, priv->url_string, 
+                        priv->type, priv->ex);
+
+                if (camel_exception_is_set (priv->ex))
+                        g_error ("Can't get service for transport account (%s)\n", 
+                                         camel_exception_get_description (priv->ex));
+                /* TODO: check ex and handle it with a GError */
+                
+                if (!camel_service_connect (priv->service, priv->ex))
+                {
+                        g_warning (_("Not connected with %s: %s\n"), priv->url_string,
+                                   camel_exception_get_description (priv->ex));
+                        camel_exception_clear (priv->ex);
+                }
-        }
-}
@@ -104 +144 @@
-        g_assert (CAMEL_IS_SESSION (apriv->session));
-
-
+
+
+
+
+
-                        apriv->url_string, &ex);
+                if (camel_exception_is_set (&ex))
+                        g_critical ("Didn't work (%s)",
+                                camel_exception_get_description (&ex));
+                apriv->service = (CamelService*) transport;
+        } else
+        {
+                if (!camel_service_connect (apriv->service, apriv->ex))
+                {
+                        g_warning (_("Not connected with %s: %s\n"), apriv->url_string,
+                                   camel_exception_get_description (apriv->ex));
+                        camel_exception_clear (apriv->ex);
+                }
+        }
-
-        if (camel_exception_is_set (&ex) || !transport)
@@ -181 +238 @@
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
+        apriv->service = NULL;
-        apriv->connected = FALSE;
-        apriv->type = CAMEL_PROVIDER_TRANSPORT;

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

@@ -162 +162 @@
-                pf = copy->data;
-
-
+
+
-                {
-                        mark_del = g_list_prepend (mark_del, copy);

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

@@ -188 +188 @@
-        const gchar *accountid;
-
-        gdk_threads_enter ();
-
-        accountid = tny_account_get_id (account);
-
@@ -231 +229 @@
-        }
-
-        gdk_threads_leave ();
-
-        return retval;
-}
+
-
-static void
@@ -258 +255 @@
-
-#endif
-
-
-static gboolean
@@ -281 +277 @@
-        }
-
-        gdk_threads_enter ();
-
-        dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-                                  
+               
-
-        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
@@ -291 +285 @@
-        gtk_widget_destroy (dialog);
-
-        gdk_threads_leave ();
-
-        return retval;
-}
+
-
-static void
@@ -391 +384 @@
-                                account = TNY_ACCOUNT (tny_camel_transport_account_new ());
-                } else if (type && (types == TNY_ACCOUNT_STORE_BOTH || types == TNY_ACCOUNT_STORE_STORE_ACCOUNTS))
-              
+
-                        if (!g_ascii_strncasecmp (proto, "imap", 4))
-                                account = TNY_ACCOUNT (tny_camel_imap_store_account_new ());
@@ -486 +479 @@
-                        tny_account_set_pass_func (TNY_ACCOUNT (account),
-                                per_account_get_pass_func);
-
+
-                        tny_list_prepend (list, (GObject*)account);
-                        g_object_unref (G_OBJECT (account));

trunk/libtinymailui-gtk/tny-gtk-header-list-model.c

@@ -264 +264 @@
-
-        readable_date_size = strftime (readable_date, 63, _("%Y-%m-%d, %-I:%M %p"), &file_time);
-
+
-        return readable_date;
-}
@@ -697 +697 @@
-        GList *list;
-        GFunc relaxed_func, final_func;
-    
+
-} RelaxedData;
-

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 (