* Makefile.am, modest-mail-operation.c:

[modest] / src / gtk / modest-transport-widget.c

diff --git a/src/gtk/modest-transport-widget.c b/src/gtk/modest-transport-widget.c
index 20a6681..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,14 +99,22 @@ 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);
 }
 
+static void
+on_button_toggled (GtkToggleButton *button, gpointer user_data)
+{
+       ModestTransportWidgetPrivate *priv;
+
+       priv = (ModestTransportWidgetPrivate *) user_data;
+
+       if (gtk_toggle_button_get_active (button))
+               gtk_widget_set_sensitive (gtk_widget_get_parent (priv->username), TRUE);
+       else
+               gtk_widget_set_sensitive (gtk_widget_get_parent (priv->username), FALSE);
+}
+
 
 static GtkWidget*
 smtp_configuration (ModestTransportWidget *self)
@@ -125,17 +131,30 @@ smtp_configuration (ModestTransportWidget *self)
        gtk_box_pack_start (GTK_BOX(box), label, FALSE, FALSE, 6);
 
        priv->servername = gtk_entry_new_with_max_length (40);
-       
+       priv->username = gtk_entry_new_with_max_length (40);
+
+       /* Servername */        
        hbox = gtk_hbox_new (FALSE, 6);
        gtk_box_pack_start (GTK_BOX(hbox), gtk_label_new (_("Servername: ")),
                            FALSE, FALSE, 6);
-       gtk_box_pack_start (GTK_BOX(hbox), priv->servername,
-                           TRUE, TRUE, 6);
+       gtk_box_pack_start (GTK_BOX(hbox), priv->servername, TRUE, TRUE, 6);
        gtk_box_pack_start (GTK_BOX(box), hbox, TRUE, TRUE, 6);
 
+       /* Auth */
        priv->auth = gtk_check_button_new_with_label (_("Requires authentication"));
        gtk_box_pack_start (GTK_BOX(box), priv->auth, TRUE, FALSE, 6);
+
+       g_signal_connect (priv->auth, "toggled", G_CALLBACK (on_button_toggled), priv);
        
+       /* Username */
+       hbox = gtk_hbox_new (FALSE, 6);
+       gtk_box_pack_start (GTK_BOX(hbox), gtk_label_new (_("Username: ")),
+                           FALSE, FALSE, 6);
+       gtk_box_pack_start (GTK_BOX(hbox), priv->username, TRUE, TRUE, 6);
+       gtk_widget_set_sensitive (hbox, FALSE);
+       gtk_box_pack_start (GTK_BOX(box), hbox, TRUE, TRUE, 6);
+
+       /* Security */
        label = gtk_label_new(NULL);
        gtk_label_set_markup (GTK_LABEL(label),_("<b>Security</b>"));
        gtk_box_pack_start (GTK_BOX(box), label, FALSE, FALSE, 0);
@@ -148,6 +167,7 @@ smtp_configuration (ModestTransportWidget *self)
                            (priv->factory, MODEST_COMBO_BOX_TYPE_SECURITY_PROTOS),
                            FALSE, FALSE,0);
        gtk_box_pack_start (GTK_BOX(box), hbox, FALSE, FALSE, 0);
+
        
        hbox = gtk_hbox_new (FALSE, 6);
        label = gtk_label_new(NULL);
@@ -165,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;
@@ -184,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);
@@ -209,6 +228,16 @@ modest_transport_widget_get_remember_password (ModestTransportWidget *self)
        return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(priv->remember_pwd));
 }
 
+gboolean
+modest_transport_widget_get_requires_auth (ModestTransportWidget *self)
+{
+       ModestTransportWidgetPrivate *priv;
+
+       g_return_val_if_fail (self, FALSE);
+       priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(self);
+
+       return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(priv->auth));
+}
 
 const gchar*
 modest_transport_widget_get_username (ModestTransportWidget *self)
@@ -233,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;