projects / modest / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a20c01f)
* gtk/*:
authorDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Mon, 15 Jan 2007 10:41:02 +0000 (10:41 +0000)
committerDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Mon, 15 Jan 2007 10:41:02 +0000 (10:41 +0000)
  - update to new ModestProtocolManager

pmo-trunk-r626

src/gtk/modest-account-assistant.c patch | blob | history
src/gtk/modest-main-window.c patch | blob | history
src/gtk/modest-store-widget.c patch | blob | history
src/gtk/modest-store-widget.h patch | blob | history
src/gtk/modest-transport-widget.c patch | blob | history
src/gtk/modest-transport-widget.h patch | blob | history

diff --git a/src/gtk/modest-account-assistant.c b/src/gtk/modest-account-assistant.c
index cb4cd10..ce6a295 100644 (file)
--- a/src/gtk/modest-account-assistant.c
+++ b/src/gtk/modest-account-assistant.c
@@ -31,7 +31,7 @@
 #include "modest-account-assistant.h"
 #include "modest-store-widget.h"
 #include "modest-transport-widget.h"
-#include "modest-proto.h"
+#include <modest-protocol-info.h>
 
 #include <string.h>
 
@@ -256,18 +256,20 @@ on_receiving_combo_box_changed (GtkComboBox *combo, ModestAccountAssistant *self
 {
        ModestAccountAssistantPrivate *priv;
        gchar *chosen;
+       ModestProtocol proto;
        
        priv = MODEST_ACCOUNT_ASSISTANT_GET_PRIVATE(self);
        chosen = gtk_combo_box_get_active_text (GTK_COMBO_BOX(combo));
-
        if (priv->store_widget)
                gtk_container_remove (GTK_CONTAINER(priv->store_holder),
                                      priv->store_widget);
+
+       proto = modest_protocol_info_get_protocol (chosen);
        
        /* FIXME: we could have these widgets cached instead of
           creating them every time */
-       priv->store_widget = modest_store_widget_new (priv->factory, chosen);
-       if (!strcmp (chosen, MODEST_PROTO_POP) || !strcmp (chosen, MODEST_PROTO_IMAP)) {
+       priv->store_widget = modest_store_widget_new (priv->factory, proto);
+       if (proto == MODEST_PROTOCOL_STORE_POP || proto == MODEST_PROTOCOL_STORE_IMAP) {
                g_signal_connect (priv->store_widget, 
                                  "data_changed", 
                                  G_CALLBACK (receiving_page_update_completeness), 
@@ -348,7 +350,7 @@ on_sending_combo_box_changed (GtkComboBox *combo, ModestAccountAssistant *self)
                                      priv->transport_widget);
        
        priv->transport_widget = modest_transport_widget_new (priv->factory,
-                                                             chosen);
+                                                             modest_protocol_info_get_protocol(chosen));
 
        gtk_container_add (GTK_CONTAINER(priv->transport_holder),
                           priv->transport_widget);
@@ -559,8 +561,9 @@ static void
 on_apply (ModestAccountAssistant *self, gpointer user_data)
 {
        ModestAccountAssistantPrivate *priv;
+       ModestProtocol proto;
        gchar *store_name, *transport_name;
-       const gchar *account_name, *username, *servername, *proto;
+       const gchar *account_name, *username, *servername;
        ModestStoreWidget *store;
        ModestTransportWidget *transport;
 
@@ -568,19 +571,20 @@ on_apply (ModestAccountAssistant *self, gpointer user_data)
 
        /* create server account -> store */
        store = MODEST_STORE_WIDGET(priv->store_widget);
-       proto = modest_store_widget_get_proto (store);
+       proto    = modest_store_widget_get_proto (store);
        username = modest_store_widget_get_username (store);
        servername = modest_store_widget_get_servername (store);
-       store_name = g_strdup_printf ("%s:%s@%s", proto, username, servername);
+       store_name = g_strdup_printf ("%s:%s@%s", modest_protocol_info_get_protocol_name(proto),
+                                     username, servername);
        
        modest_account_mgr_add_server_account (priv->account_mgr, store_name, servername,
-                                               username, NULL, proto);
+                                              username, NULL, proto);
 
        /* create server account -> transport */
        transport = MODEST_TRANSPORT_WIDGET(priv->transport_widget);
        proto = modest_transport_widget_get_proto (transport);
-
-       if (!strcmp (proto, MODEST_PROTO_SMTP)) {
+       
+       if (proto == MODEST_PROTOCOL_TRANSPORT_SMTP) {
                servername = modest_transport_widget_get_servername (transport);
                if (modest_transport_widget_get_requires_auth (transport))
                        username = modest_transport_widget_get_username (transport);
@@ -591,8 +595,9 @@ on_apply (ModestAccountAssistant *self, gpointer user_data)
                servername = "localhost";
 
        }
-       transport_name = g_strdup_printf ("%s:%s@%s", proto, username, servername);
-       
+       transport_name = g_strdup_printf ("%s:%s@%s",
+                                         modest_protocol_info_get_protocol_name(proto),
+                                         username, servername);
        modest_account_mgr_add_server_account (priv->account_mgr,
                                                transport_name,
                                                servername,
diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c
index 3f8ab43..1f72df2 100644 (file)
--- a/src/gtk/modest-main-window.c
+++ b/src/gtk/modest-main-window.c
@@ -188,7 +188,6 @@ header_view_new (ModestMainWindow *self)
        ModestHeaderViewColumn cols[] = {
                MODEST_HEADER_VIEW_COLUMN_MSGTYPE,
                MODEST_HEADER_VIEW_COLUMN_ATTACH,
-/*             MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER, */
                MODEST_HEADER_VIEW_COLUMN_FROM,
                MODEST_HEADER_VIEW_COLUMN_SUBJECT,
                MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE
diff --git a/src/gtk/modest-store-widget.c b/src/gtk/modest-store-widget.c
index 47d7ef8..85986c4 100644 (file)
--- a/src/gtk/modest-store-widget.c
+++ b/src/gtk/modest-store-widget.c
@@ -44,15 +44,14 @@ enum {
 typedef struct _ModestStoreWidgetPrivate ModestStoreWidgetPrivate;
 struct _ModestStoreWidgetPrivate {
        
-       gchar* proto;
-       
        GtkWidget *servername;
        GtkWidget *username;
        GtkWidget *security;
        GtkWidget *auth;
        GtkWidget *chooser;
        GtkWidget *remember_pwd;
-       
+
+       ModestProtocol proto;
        ModestWidgetFactory *factory;
 };
 #define MODEST_STORE_WIDGET_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -116,8 +115,7 @@ modest_store_widget_init (ModestStoreWidget *obj)
        ModestStoreWidgetPrivate *priv;
        
        priv = MODEST_STORE_WIDGET_GET_PRIVATE(obj); 
-
-       priv->proto = NULL;
+       priv->proto = MODEST_PROTOCOL_UNKNOWN;
 }
 
 
@@ -271,18 +269,13 @@ modest_store_widget_finalize (GObject *obj)
                priv->factory = NULL;
        }
 
-       if (priv->proto) {
-               g_free (priv->proto);
-               priv->proto = NULL;
-       }
-
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 
 
 GtkWidget*
-modest_store_widget_new (ModestWidgetFactory *factory, const gchar *proto)
+modest_store_widget_new (ModestWidgetFactory *factory, ModestProtocol proto)
 {
        GObject *obj;
        GtkWidget *w;
@@ -299,16 +292,15 @@ modest_store_widget_new (ModestWidgetFactory *factory, const gchar *proto)
        g_object_ref (factory);
        priv->factory = factory;
 
-       priv->proto = g_strdup (proto);
+       priv->proto = proto;
        
-       if (strcmp (proto, MODEST_PROTOCOL_STORE_POP) == 0 ||
-           strcmp (proto, MODEST_PROTOCOL_STORE_IMAP) == 0) {
+       if (proto == MODEST_PROTOCOL_STORE_POP || proto == MODEST_PROTOCOL_STORE_IMAP)
                w = imap_pop_configuration (self);
-       } else if (strcmp (proto, MODEST_PROTOCOL_STORE_MAILDIR) == 0) {
+       else if (proto == MODEST_PROTOCOL_STORE_MAILDIR) 
                w = maildir_configuration (self);
-       }  else if (strcmp (proto, MODEST_PROTOCOL_STORE_MBOX) == 0) {
+       else if (proto == MODEST_PROTOCOL_STORE_MBOX)
                w = mbox_configuration (self);
-       } else
+       else
                w = gtk_label_new ("");
        
        gtk_widget_show_all (w);
@@ -352,12 +344,12 @@ modest_store_widget_get_servername (ModestStoreWidget *self)
 }
 
 
-const gchar*
+ModestProtocol
 modest_store_widget_get_proto (ModestStoreWidget *self)
 {
        ModestStoreWidgetPrivate *priv;
 
-       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (self, MODEST_PROTOCOL_UNKNOWN);
        priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
 
        return priv->proto;
diff --git a/src/gtk/modest-store-widget.h b/src/gtk/modest-store-widget.h
index fc73398..15a0d2b 100644 (file)
--- a/src/gtk/modest-store-widget.h
+++ b/src/gtk/modest-store-widget.h
@@ -34,12 +34,12 @@ struct _ModestStoreWidgetClass {
 GType        modest_store_widget_get_type    (void) G_GNUC_CONST;
 
 GtkWidget*   modest_store_widget_new         (ModestWidgetFactory *factory,
-                                             const gchar* proto);
+                                             ModestProtocol proto);
 
-gboolean       modest_store_widget_get_remember_password (ModestStoreWidget *self);
-const gchar*   modest_store_widget_get_username          (ModestStoreWidget *self);
-const gchar*   modest_store_widget_get_servername        (ModestStoreWidget *self);
-const gchar*   modest_store_widget_get_proto             (ModestStoreWidget *self);
+gboolean        modest_store_widget_get_remember_password (ModestStoreWidget *self);
+const gchar*    modest_store_widget_get_username          (ModestStoreWidget *self);
+const gchar*    modest_store_widget_get_servername        (ModestStoreWidget *self);
+ModestProtocol  modest_store_widget_get_proto             (ModestStoreWidget *self);
 
 G_END_DECLS
 
diff --git a/src/gtk/modest-transport-widget.c b/src/gtk/modest-transport-widget.c
index 362e557..ed1ce8b 100644 (file)
--- a/src/gtk/modest-transport-widget.c
+++ b/src/gtk/modest-transport-widget.c
@@ -19,15 +19,13 @@ enum {
 
 typedef struct _ModestTransportWidgetPrivate ModestTransportWidgetPrivate;
 struct _ModestTransportWidgetPrivate {
-
-       gchar *proto;
+       ModestProtocol proto;
        ModestWidgetFactory *factory;
 
        GtkWidget *servername;
        GtkWidget *username;
        GtkWidget *auth;
        GtkWidget *remember_pwd;
-
 };
 #define MODEST_TRANSPORT_WIDGET_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                      MODEST_TYPE_TRANSPORT_WIDGET, \
@@ -87,7 +85,7 @@ modest_transport_widget_init (ModestTransportWidget *obj)
        ModestTransportWidgetPrivate *priv;
        priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(obj); 
        
-       priv->proto = NULL;
+       priv->proto = MODEST_PROTOCOL_UNKNOWN;
 }
 
 static void
@@ -101,11 +99,6 @@ modest_transport_widget_finalize (GObject *obj)
                priv->factory = NULL;
        }
 
-       if (priv->proto) {
-               g_free (priv->proto);
-               priv->proto = NULL;
-       }
-
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -192,9 +185,8 @@ smtp_configuration (ModestTransportWidget *self)
 }
 
 
-
 GtkWidget*
-modest_transport_widget_new (ModestWidgetFactory *factory, const gchar* proto)
+modest_transport_widget_new (ModestWidgetFactory *factory, ModestProtocol proto)
 {
        GObject *obj;
        GtkWidget *w;
@@ -211,11 +203,11 @@ modest_transport_widget_new (ModestWidgetFactory *factory, const gchar* proto)
        g_object_ref (factory);
        priv->factory = factory;
 
-       priv->proto = g_strdup (proto);
+       priv->proto = proto;
        
-       if (strcmp (proto, MODEST_PROTOCOL_TRANSPORT_SMTP) == 0) {
+       if (proto == MODEST_PROTOCOL_TRANSPORT_SMTP) 
                w = smtp_configuration (self);
-       } else
+       else
                w = gtk_label_new ("");
        
        gtk_widget_show_all (w);
@@ -270,12 +262,12 @@ modest_transport_widget_get_servername (ModestTransportWidget *self)
 }
 
 
-const gchar*
+ModestProtocol
 modest_transport_widget_get_proto (ModestTransportWidget *self)
 {
        ModestTransportWidgetPrivate *priv;
 
-       g_return_val_if_fail (self, FALSE);
+       g_return_val_if_fail (self, MODEST_PROTOCOL_UNKNOWN);
        priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(self);
 
        return priv->proto;
diff --git a/src/gtk/modest-transport-widget.h b/src/gtk/modest-transport-widget.h
index 68280a3..5a8b318 100644 (file)
--- a/src/gtk/modest-transport-widget.h
+++ b/src/gtk/modest-transport-widget.h
@@ -33,13 +33,13 @@ struct _ModestTransportWidgetClass {
 /* member functions */
 GType        modest_transport_widget_get_type    (void) G_GNUC_CONST;
 
-GtkWidget*   modest_transport_widget_new         (ModestWidgetFactory *factory, const gchar *proto);
+GtkWidget*   modest_transport_widget_new         (ModestWidgetFactory *factory, ModestProtocol proto);
 
-gboolean       modest_transport_widget_get_remember_password (ModestTransportWidget *self);
-gboolean       modest_transport_widget_get_requires_auth     (ModestTransportWidget *self);
-const gchar*   modest_transport_widget_get_username          (ModestTransportWidget *self);
-const gchar*   modest_transport_widget_get_servername        (ModestTransportWidget *self);
-const gchar*   modest_transport_widget_get_proto             (ModestTransportWidget *self);
+gboolean        modest_transport_widget_get_remember_password (ModestTransportWidget *self);
+gboolean        modest_transport_widget_get_requires_auth     (ModestTransportWidget *self);
+const gchar*    modest_transport_widget_get_username          (ModestTransportWidget *self);
+const gchar*    modest_transport_widget_get_servername        (ModestTransportWidget *self);
+ModestProtocol  modest_transport_widget_get_proto             (ModestTransportWidget *self);
 
 G_END_DECLS
 
"modest" is a lean & mean e-mail program.