Changeset 90

Timestamp:

04/25/08 14:01:07

Author:

pvanhoof

Message:

• • • • The From of transport-accounts
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/tmut-account-editor.c (modified) (8 diffs)
• trunk/src/tmut-account-editor.h (modified) (1 diff)
• trunk/src/tmut-account-manager.c (modified) (2 diffs)
• trunk/src/tmut-account-store.c (modified) (11 diffs)
• trunk/src/tmut-account-store.h (modified) (2 diffs)
• trunk/src/tmut-msg-creator.c (modified) (2 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * Bugfix when error reporting on sending message
+        * The From of transport-accounts
-
-2008-04-22  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/tmut-account-editor.c

@@ -29 +29 @@
-
-#include <tny-camel-account.h>
+#include <tny-camel-transport-account.h>
-#include <tny-simple-list.h>
-#include <tny-list.h>
@@ -51 +52 @@
-
-        GtkWidget *name_entry, *hostname_entry, *enabled_checkbutton,
-
+
+
-};
-
@@ -77 +79 @@
-        return gtk_entry_get_text (GTK_ENTRY (priv->hostname_entry));
-}
+
+const gchar* 
+tmut_account_editor_get_from (TMutAccountEditor *self)
+{
+        TMutAccountEditorPriv *priv = TMUT_ACCOUNT_EDITOR_GET_PRIVATE (self);
+        return gtk_entry_get_text (GTK_ENTRY (priv->from_entry));
+}
+
-
-const gchar* 
@@ -137 +147 @@
-                        tny_account_get_user (account)?tny_account_get_user (account):"");
-
+                if (TNY_IS_CAMEL_TRANSPORT_ACCOUNT (account)) {
+                        TnyCamelTransportAccount *ta = (TnyCamelTransportAccount *) account;
+                        gtk_entry_set_text (GTK_ENTRY (priv->from_entry), 
+                                tny_camel_transport_account_get_from (ta)?tny_camel_transport_account_get_from (ta):"");
+                }
+
-                tny_camel_account_get_options (TNY_CAMEL_ACCOUNT (account), options);
-                iter = tny_list_create_iterator (options);
@@ -203 +219 @@
-        GtkWidget *ok_button, *cancel_button;
-        GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+        GtkWidget *mhbox = gtk_hbox_new (FALSE, 0);
+
-        table = gtk_table_new (6, 2, FALSE);
-
@@ -211 +229 @@
-        gtk_widget_show (cancel_button);
-        gtk_widget_show (ok_button);
+        gtk_widget_show (mhbox);
-
-        gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (cancel_button), 
@@ -245 +264 @@
-        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
-
+ (+ From)
-        gtk_widget_show (label);
-        gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5,
@@ -285 +304 @@
-        priv->type_entry = gtk_entry_new ();
-        gtk_widget_show (priv->type_entry);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        priv->options_entry = gtk_entry_new ();

trunk/src/tmut-account-editor.h

@@ -63 +63 @@
-const gchar* tmut_account_editor_get_account_type (TMutAccountEditor *self); 
-const gchar* tmut_account_editor_get_user (TMutAccountEditor *self);
+const gchar* tmut_account_editor_get_from (TMutAccountEditor *self);
-gchar** tmut_account_editor_get_options (TMutAccountEditor *self);
-TnyAccount *tmut_account_editor_get_account (TMutAccountEditor *self);

trunk/src/tmut-account-manager.c

@@ -79 +79 @@
-                tmut_account_editor_get_account_type (editor), 
-                tmut_account_editor_get_user (editor), 
-
+
+
+
-                (const char **) options);
-
@@ -101 +103 @@
-                tmut_account_editor_get_proto (editor), 
-                tmut_account_editor_get_user (editor), 
-
+
+
+
-                (const char **) options);
-

trunk/src/tmut-account-store.c

@@ -103 +103 @@
-
-static TnyAccount*
-
+, const gchar *from
-{
-        TnyAccount *account = NULL;
@@ -150 +150 @@
-
-                if (!g_ascii_strncasecmp (proto, "pop", 3) || 
-
+
+
-                        tny_account_set_user (account, user);
-                        tny_account_set_hostname (account, hostname);
-                        if (port != -1)
-                                tny_account_set_port (account, port);
-
-
+
-
-                tny_account_set_id (account, fullfilen);
@@ -166 +166 @@
-
-        }
+
+        if (TNY_IS_CAMEL_TRANSPORT_ACCOUNT (account))
+                tny_camel_transport_account_set_from (TNY_CAMEL_TRANSPORT_ACCOUNT (account), from);
-
-        return account;
@@ -179 +182 @@
-                const gchar *user,
-                const gchar *mech,
+                const gchar *from,
-                gint port,
-                const gchar **options)
@@ -231 +235 @@
-
-        account = create_account_instance (priv, type, proto, mech, name, 
-
+, from
-
-        if (account) {
@@ -271 +275 @@
-}
-
-
+
+
-                gboolean enabled,
-                const gchar *name, 
@@ -278 +283 @@
-                const gchar *user,
-                const gchar *mech,
+                const gchar *from,
-                gint port,
-                const gchar **options)
@@ -316 +322 @@
-                tny_account_set_secure_auth_mech (account, mech);
-                g_key_file_set_value (keyfile, "tmut", "mech", mech);
+        }
+
+        if (from && TNY_IS_CAMEL_TRANSPORT_ACCOUNT (account)) {
+                tny_camel_transport_account_set_from (TNY_CAMEL_TRANSPORT_ACCOUNT (account), from);
+                g_key_file_set_value (keyfile, "tmut", "from", from);
-        }
-
@@ -393 +404 @@
-                GError *port_err = NULL;
-                GKeyFile *keyfile;
-
+from, *
-                gchar *name, *mech, **options;
-                gsize options_len;
@@ -423 +434 @@
-                url_string = g_key_file_get_value (keyfile, "tmut", "url_string", NULL);
-                port = g_key_file_get_integer (keyfile, "tmut", "port", &port_err);
+                from = g_key_file_get_value (keyfile, "tmut", "from", NULL);
-
-                if (port_err) {
@@ -429 +441 @@
-                }
-
-
+, from
-
-                if (account)

trunk/src/tmut-account-store.h

@@ -61 +61 @@
-                const gchar *user,
-                const gchar *mech,
+                const gchar *from,
-                gint port,
-                const gchar **options);
@@ -73 +74 @@
-                const gchar *user,
-                const gchar *mech,
+                const gchar *from,
-                gint port,
-                const gchar **options);

trunk/src/tmut-msg-creator.c

@@ -37 +37 @@
-#include <tny-camel-send-queue.h>
-#include <tny-camel-mime-part.h>
+#include <tny-camel-transport-account.h>
-
-#include <string.h>
@@ -220 +221 @@
-
-                        tny_header_set_subject (header, gtk_entry_get_text (priv->subject_entry));
-
+
+
+
+
+
+
+
+
+
+
-                        tny_header_set_to (header, gtk_entry_get_text (priv->to_entry));
-