Changeset 42

Timestamp:

11/05/07 22:51:24

Author:

pvanhoof

Message:

2007-11-05 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Sending messages through a TnySendQueue? and TnyTransportAccount?
        
      • Fixed forwarding a message
        
      • Fixed replying a message
        

Files:

• trunk (modified) (1 prop)
• trunk/.svnignore (modified) (1 diff)
• trunk/ChangeLog (modified) (1 diff)
• trunk/src/tmut-main.c (modified) (1 diff)
• trunk/src/tmut-msg-creator.c (modified) (13 diffs)
• trunk/src/tmut-msg-creator.h (modified) (1 diff)
• trunk/src/tmut-shared.h (modified) (1 diff)

trunk/.svnignore

@@ +1 @@
+.anjuta
-mkinstalldirs
-configure

trunk/ChangeLog

@@ +1 @@
+2007-11-05  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Sending messages through a TnySendQueue and TnyTransportAccount
+        * Fixed forwarding a message
+        * Fixed replying a message
+
-2007-11-04  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/src/tmut-main.c

@@ -33 +33 @@
-#include "tmut-shell-window.h"
-
+TnyPlatformFactory *platfact = NULL;
+GHashTable *send_queues = NULL;
+
-int 
-main (int argc, char **argv)
-{
-        GtkWidget *window;
-        TnyPlatformFactory *platfact;
-        TnyAccountStore *account_store;
-        TnyAccountStoreView *view;

trunk/src/tmut-msg-creator.c

@@ -32 +32 @@
-
-#include <tny-gtk-account-list-model.h>
+#include <tny-platform-factory.h>
+#include <tny-camel-mem-stream.h>
+#include <tny-camel-send-queue.h>
+
+#include <string.h>
-
-static GObjectClass *parent_class = NULL;
@@ -41 +46 @@
-        GtkEntry *subject_entry, *to_entry;
-        GtkTextView *message_textview;
-
+, *attachments_button
-        GtkComboBox *accounts_combo;
+        TnyList *attachments;
-};
-
-#define TMUT_MSG_CREATOR_GET_PRIVATE(o) \
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TMUT_TYPE_MSG_CREATOR, TMutMsgCreatorPriv))
+
+/* Translator: this is the text on the button next to the Attachments label of
+ * the message composer window. It should show how many items are attached to
+ * the new message. */
+
+#define ATTACH_TXT _("%d attached")
+
+typedef struct
+{
+        TnySendQueue *send_queue;
+        TMutMsgCreator *self;
+        TnyHeader *header;
+} OnResponseInfo;
+
+static GtkWidget *rem_dialog = NULL;
+
+static void
+on_response (GtkDialog *dialog, gint response, gpointer user_data)
+{
+        OnResponseInfo *info = (OnResponseInfo *) user_data;
+
+        if (response == GTK_RESPONSE_YES) {
+                TnyFolder *outbox = tny_send_queue_get_outbox (info->send_queue);
+                tny_folder_remove_msg (outbox, info->header, NULL);
+                tny_folder_sync (outbox, TRUE, NULL);
+                g_object_unref (outbox);
+        }
+
+        g_object_unref (info->header);
+        g_object_unref (info->self);
+
+        gtk_widget_destroy (GTK_WIDGET (dialog));
+        rem_dialog = NULL;
+
+        g_slice_free (OnResponseInfo, info);
+
+        return;
+}
+
+
+static void 
+on_send_queue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data)
+{
+        TMutMsgCreatorPriv *priv = TMUT_MSG_CREATOR_GET_PRIVATE (user_data);
+
+        if (header)
+        {
+                gchar *str = g_strdup_printf (_("%s.\nDo you want to remove the message (%s)?"),
+                        err->message, tny_header_get_subject (header));
+
+                if (!rem_dialog)
+                {
+                        OnResponseInfo *info = g_slice_new (OnResponseInfo);
+
+                        rem_dialog = gtk_message_dialog_new (GTK_WINDOW (priv->shell), 
+                                0, GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, str);
+                        g_free (str);
+
+                        info->send_queue = (TnySendQueue *) g_object_ref (self);
+                        info->self = (TMutMsgCreator *) g_object_ref (user_data);
+                        info->header = (TnyHeader *) g_object_ref (header);
+
+                        g_signal_connect (G_OBJECT (rem_dialog), "response",
+                                G_CALLBACK (on_response), info);
+
+                        gtk_widget_show_all (rem_dialog);
+                }
+        }
+        return;
+}
+
+static TnySendQueue*
+get_send_queue_for (TnyAccount *account, TMutMsgCreator *self)
+{
+        TnySendQueue *retval;
+
+        if (!send_queues)
+                send_queues = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+        retval = g_hash_table_lookup (send_queues, (gconstpointer) account);
+
+        if (!retval) {
+                TnySendQueue *send_queue = tny_camel_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT (account));
+                g_signal_connect (G_OBJECT (send_queue), "error-happened",
+                        G_CALLBACK (on_send_queue_error_happened), self);
+                g_hash_table_insert (send_queues, account, send_queue);
+                retval = send_queue;
+        }
+
+        return TNY_SEND_QUEUE (g_object_ref (retval));
+}
-
-static void
@@ -55 +152 @@
-        TnyAccount *account = NULL;
-        GtkTreeModel *model = gtk_combo_box_get_model (priv->accounts_combo);
+        gboolean not_ready = FALSE;
-
-        if (gtk_combo_box_get_active_iter (priv->accounts_combo, &iter)) 
@@ -61 +159 @@
-                        TNY_GTK_ACCOUNT_LIST_MODEL_INSTANCE_COLUMN, 
-                        &account, -1);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        g_object_unref (account);
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -146 +290 @@
-        gmtime_r (&file_time_raw, &file_time);
-
+        /* Translator: this date-format is the date format for when creating a
+         * reply of a message. */
-        readable_date_size = strftime (readable_date, 63, _("%Y-%m-%d, %-I:%M %p"), &file_time);
-
@@ -154 +300 @@
-}
-
-
-
+
-tmut_msg_creator_add_attachment (TMutMsgCreator *self, TnyMimePart *part)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-void 
@@ -167 +347 @@
-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer (priv->message_textview);
-        TnyHeader *header = tny_msg_get_header (msg);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return;
@@ -197 +370 @@
-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer (priv->message_textview);
-        TnyHeader *header = tny_msg_get_header (msg);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (str) {
-str->str, 
-
+gstr->str, g
+g
-        }
-
@@ -260 +438 @@
-        GtkCellRenderer *renderer;
-        GtkTreeViewColumn *column;
+        gchar *str = NULL;
+
+        priv->attachments = tny_simple_list_new ();
-
-        vbox1 = GTK_WIDGET (instance);
-
-3
+4
-        gtk_widget_show (table1);
-        gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, TRUE, 0);
@@ -292 +473 @@
-        gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
-
+
+        label2 = gtk_label_new (_("<b>Attached:</b>"));
+        gtk_widget_show (label2);
+        gtk_table_attach (GTK_TABLE (table1), label2, 0, 1, 3, 4,
+                        (GtkAttachOptions) (GTK_FILL),
+                        (GtkAttachOptions) (0), 0, 0);
+        gtk_label_set_use_markup (GTK_LABEL (label2), TRUE);
+        gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
+
-        priv->accounts_combo = GTK_COMBO_BOX (gtk_combo_box_new ());
-        gtk_widget_show (GTK_WIDGET (priv->accounts_combo));
@@ -305 +495 @@
-                        (GtkAttachOptions) (0), 0, 0);
-
+        priv->to_entry = GTK_ENTRY (gtk_entry_new ());
+        gtk_widget_show (GTK_WIDGET (priv->to_entry));
+        gtk_table_attach (GTK_TABLE (table1), GTK_WIDGET (priv->to_entry), 
+                        1, 2, 1, 2,
+                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                        (GtkAttachOptions) (0), 0, 0);
+
-        priv->subject_entry = GTK_ENTRY (gtk_entry_new ());
-        gtk_widget_show (GTK_WIDGET (priv->subject_entry));
-        gtk_table_attach (GTK_TABLE (table1), GTK_WIDGET (priv->subject_entry), 
-1, 2
+2, 3
-                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-
-
-
-
-
+
+
+
+
+
+
-                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
@@ -336 +535 @@
-                G_CALLBACK (on_send_button_clicked), instance);
-
+        g_signal_connect (G_OBJECT (priv->attachments_button), "clicked",
+                G_CALLBACK (on_attachments_button_clicked), instance);
+
-        return;
-}
@@ -343 +545 @@
-tmut_msg_creator_finalize (GObject *object)
-{
+        TMutMsgCreatorPriv *priv = TMUT_MSG_CREATOR_GET_PRIVATE (object);
+
+        g_object_unref (priv->attachments);
+
-        (*parent_class->finalize) (object);
-

trunk/src/tmut-msg-creator.h

@@ -60 +60 @@
-void tmut_msg_creator_set_forward_msg (TMutMsgCreator *self, TnyMsg *msg);
-
+void tmut_msg_creator_add_attachment (TMutMsgCreator *self, TnyMimePart *part);
+void tmut_msg_creator_remove_attachment (TMutMsgCreator *self, TnyMimePart *part);
+
-G_END_DECLS
-

trunk/src/tmut-shared.h

@@ -1 +1 @@
-#ifndef TMUT_SHARED_H
-#define TMUT_SHARED_H
+#include <tny-platform-factory.h>
+#include <tny-send-queue.h>
+
-typedef struct _TMutShellWindow TMutShellWindow;
-typedef struct _TMutShellWindowClass TMutShellWindowClass;
-typedef struct _TMutShellChild TMutShellChild;
-typedef struct _TMutShellChildIface TMutShellChildIface;
+
+extern TnyPlatformFactory *platfact;
+extern GHashTable *send_queues;
+
-#endif