Changeset 2109

Timestamp:

06/08/07 16:16:25

Author:

pvanhoof

Message:

Bugfixes for SMTP and the folder monitr

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-service.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (1 diff)
• trunk/libtinymail/tny-folder-monitor.c (modified) (1 diff)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (9 diffs)

trunk/ChangeLog

@@ -10 +10 @@
-        * Total and ~unread even when the folder was never refreshed
-        * Support for the Content-Disposition header in mime parts
+        * Some bugfixes in the SMTP support
+        * Bugfix in the TnyFolderMonitor
-
-2007-06-08  Jose Dapena Paz  <jdapena@igalia.com>

trunk/libtinymail-camel/camel-lite/camel/camel-service.c

@@ -441 +441 @@
-                        camel_operation_unregister (service->connect_op);
-
-
+
+
-                service->connect_op = NULL;
-                CAMEL_SERVICE_UNLOCK (service, connect_op_lock);

trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c

@@ -125 +125 @@
-}
-
+static void
+camel_smtp_transport_finalize (CamelSmtpTransport *self)
+{
+        g_print ("debug\n");
+}
+
-CamelType
-camel_smtp_transport_get_type (void)
@@ -138 +144 @@
-                                            NULL,
-                                            (CamelObjectInitFunc) camel_smtp_transport_init,
-NULL
+(CamelObjectFinalizeFunc) camel_smtp_transport_finalize
-        }
-        
@@ -495 +501 @@
-                                                "authentication type %s."),
-                                              service->url->host, service->url->authmech);
+
+                        camel_session_alert_user (session, CAMEL_SESSION_ALERT_ERROR, 
+                                camel_exception_get_description (ex), FALSE);
+
-                        camel_service_disconnect (service, TRUE, NULL);
-                        return FALSE;
@@ -1394 +1404 @@
-        }
-        g_free (cmdbuf);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                g_free (respbuf);
-
-
-
-
-
-
-
-
-
-
-
-
+
-        return TRUE;
-}

trunk/libtinymail-camel/tny-camel-send-queue.c

@@ -186 +186 @@
-                        tny_list_prepend (hassent, G_OBJECT (header));
-                        msg = tny_folder_get_msg (outbox, header, &err);
-    
+
-
-                        if (err == NULL) 
@@ -192 +192 @@
-                                tny_transport_account_send (priv->trans_account, msg, &err);
-
-
+ {
-                                        emit_error (self, msg, err, i, priv->total);
-
-
+
+
+
-                                emit_error (self, msg, err, i, priv->total);
+                                priv->do_continue = FALSE;
+                        }
-
-                        g_mutex_lock (priv->todo_lock);
@@ -207 +210 @@
-                                        {
-                                                emit_error (self, msg, newerr, i, priv->total);
+                                                priv->do_continue = FALSE;
-                                                g_error_free (newerr);
-                                        }

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

@@ -292 +292 @@
-        }
-
-FALS
+TRU
-        apriv->connected = FALSE;
-

trunk/libtinymail/tny-folder-monitor.c

@@ -165 +165 @@
-                header = TNY_HEADER (tny_iterator_get_current (iter));
-                id = tny_header_get_uid (header);
-
+uid && 
-                { 
-                        found = TRUE; 

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -68 +68 @@
-#include <tny-merge-folder.h>
-
+#include <tny-camel-send-queue.h>
+
-#define GO_ONLINE_TXT _("Go online")
-#define GO_OFFLINE_TXT _("Go offline")
@@ -103 +105 @@
-        TnyFolderMonitor *monitor; GMutex *monitor_lock;
-        gboolean handle_recon;
+        TnySendQueue *send_queue;
-};
-
@@ -214 +217 @@
-
-        TnyList *accounts = TNY_LIST (mailbox_model);
+        TnyList *saccounts = tny_simple_list_new ();
-
-        maccounts = tny_gtk_account_list_model_new ();
-
-
-        clear_header_view (priv);
@@ -234 +237 @@
-        tny_account_store_get_accounts (account_store, TNY_LIST (maccounts),
-                        TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+
-        gtk_combo_box_set_model (priv->account_view, maccounts);
+
+        tny_account_store_get_accounts (account_store, saccounts,
+                        TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
+
+        if (tny_list_get_length (saccounts) > 0)
+        {
+                TnyIterator *iter = tny_list_create_iterator (saccounts);
+                TnyTransportAccount *tacc = (TnyTransportAccount *)tny_iterator_get_current (iter);
+                if (priv->send_queue)
+                        g_object_unref (priv->send_queue);
+                priv->send_queue = tny_camel_send_queue_new ((TnyCamelTransportAccount *) tacc);
+                g_object_unref (tacc);
+                g_object_unref (iter);
+        }
+        g_object_unref (saccounts);
-
-        /* Here we use the TnyFolderStoreTreeModel as a GtkTreeModel */
@@ -402 +421 @@
-on_header_view_key_press_event (GtkTreeView *header_view, GdkEventKey *event, gpointer user_data)
-{
+        TnyDemouiSummaryView *self = (TnyDemouiSummaryView *) user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+
+
+        if (event->keyval == GDK_Home && priv->send_queue)
+        {
+                GtkTreeSelection *selection = gtk_tree_view_get_selection (header_view);
+                GtkTreeModel *model;
+                GtkTreeIter iter;
+
+                if (gtk_tree_selection_get_selected (selection, &model, &iter))
+                {
+                        TnyHeader *header;
+
+                        gtk_tree_model_get (model, &iter, 
+                                TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                                &header, -1);
+
+                        if (header)
+                        {
+                                GError *err = NULL;
+                                TnyMsg *msg;
+                                TnyFolder *folder;
+
+                                GtkWidget *entry1, *entry2;
+                                GtkWidget *dialog;
+
+                                folder = tny_header_get_folder (header);
+                                if (folder) {
+                                        msg = tny_folder_get_msg (folder, header, &err);
+                                        g_object_unref (folder);
+                                }
+
+                                if (!msg || err != NULL)
+                                {
+                                        g_warning ("Can't forward message: %s\n", err->message);
+                                        if (msg) 
+                                                g_object_unref (msg);
+                                        g_object_unref (header);
+                                        return;
+                                }
+
+                                dialog = gtk_dialog_new_with_buttons (_("Forward a message"),
+                                                  NULL, GTK_DIALOG_MODAL,
+                                                  GTK_STOCK_OK,
+                                                  GTK_RESPONSE_YES,
+                                                  GTK_STOCK_CANCEL,
+                                                  GTK_RESPONSE_REJECT,
+                                                  NULL);
+
+                                entry1 = gtk_entry_new ();
+                                gtk_entry_set_text (GTK_ENTRY (entry1), _("To: "));
+                                gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), entry1);
+                                gtk_widget_show (entry1);
+
+                                entry2 = gtk_entry_new ();
+                                gtk_entry_set_text (GTK_ENTRY (entry2), _("From: "));
+                                gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), entry2);
+                                gtk_widget_show (entry2);
+
+                                if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
+                                {
+                                        TnyHeader *nheader = tny_msg_get_header (msg);
+                                        const gchar *to = gtk_entry_get_text (GTK_ENTRY (entry1));
+                                        const gchar *from = gtk_entry_get_text (GTK_ENTRY (entry2));
+
+                                        tny_header_set_to (nheader, to);
+                                        tny_header_set_to (nheader, from);
+
+                                        g_object_unref (nheader);
+                                        tny_send_queue_add (priv->send_queue, msg, NULL);
+                                }
+
+                                gtk_widget_destroy (dialog);
+
+                                g_object_unref (msg);
+                                g_object_unref (G_OBJECT (header));
+                        }
+                }
+        }
+
-        if (event->keyval == GDK_Delete)
-        {
@@ -768 +868 @@
-                                if (G_LIKELY (msg))
-                                {
-
-/* DEBUG                
-                                        TnyAccountStore *astore = priv->account_store;
-                                        TnyList *accs = tny_simple_list_new ();
-                                        tny_account_store_get_accounts (astore, accs, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
-                                        TnyIterator *iter = tny_list_create_iterator (accs);
-                                        TnyCamelTransportAccount *acc = (TnyCamelTransportAccount *) tny_iterator_get_current (iter);
-
-                                        g_print ("--> %s\n", tny_account_get_name (TNY_ACCOUNT (acc)));
-                
-                                        if (!queue)
-                                                queue = tny_camel_send_queue_new (acc);
-                
-                                        tny_send_queue_add (queue, msg, NULL);
-
-                                        g_object_unref (G_OBJECT (acc));
-                                        g_object_unref (G_OBJECT (iter));
-                                        g_object_unref (G_OBJECT (accs));
-*/
-
-                                        msgwin = tny_gtk_msg_window_new (
-                                                tny_platform_factory_new_msg_view (platfact));
@@ -796 +876 @@
-                                        gtk_widget_show (GTK_WIDGET (msgwin));
-                                } else {
-
-
-
-                                        msgwin = tny_gtk_msg_window_new (
-                                                tny_platform_factory_new_msg_view (platfact));
@@ -1147 +1224 @@
-
-                        dialog = gtk_dialog_new_with_buttons (_("Create a folder"),
-                                                       
-                                                       
-                                                       
-                                                       
-                                                       
-                                                       
-                                                       
+
+
+
+
+
+
+
-
-                        entry = gtk_entry_new ();
@@ -1404 +1481 @@
-        priv->monitor = NULL;
-
+        priv->send_queue = NULL;
-        priv->last_mailbox_correct_select_set = FALSE;
-        priv->online_button = gtk_toggle_button_new_with_label (GO_ONLINE_TXT);