2007-05-15 Murray Cumming <murrayc@murrayc.com>

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

diff --git a/src/gnome/modest-transport-widget.c b/src/gnome/modest-transport-widget.c
index 69e900e..aec1ab5 100644 (file)
--- a/src/gnome/modest-transport-widget.c
+++ b/src/gnome/modest-transport-widget.c
@@ -24,7 +24,7 @@ enum {
 
 typedef struct _ModestTransportWidgetPrivate ModestTransportWidgetPrivate;
 struct _ModestTransportWidgetPrivate {
-       ModestProtocol proto;
+       ModestTransportStoreProtocol proto;
        GtkWidget *servername;
        GtkWidget *username;
        GtkWidget *auth;
@@ -88,7 +88,7 @@ modest_transport_widget_init (ModestTransportWidget *obj)
        ModestTransportWidgetPrivate *priv;
        priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(obj); 
        
-       priv->proto = MODEST_PROTOCOL_UNKNOWN;
+       priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
 }
 
 static void
@@ -160,7 +160,7 @@ smtp_configuration (ModestTransportWidget *self)
        gtk_label_set_text (GTK_LABEL(label),_("Connection type:"));
        gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-       protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_AUTH);
+       protos = modest_protocol_info_get_auth_protocol_pair_list ();
        combo  = modest_combo_box_new (protos, g_str_equal);
        modest_pair_list_free (protos);
        
@@ -173,7 +173,7 @@ smtp_configuration (ModestTransportWidget *self)
        gtk_label_set_text (GTK_LABEL(label),_("Authentication:"));
        gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 6);
 
-       protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_AUTH);
+       protos = modest_protocol_info_get_auth_protocol_pair_list ();
        combo  = modest_combo_box_new (protos, g_str_equal);
        modest_pair_list_free (protos);
        
@@ -187,7 +187,7 @@ smtp_configuration (ModestTransportWidget *self)
 
 
 GtkWidget*
-modest_transport_widget_new (ModestProtocol proto)
+modest_transport_widget_new (ModestTransportStoreProtocol proto)
 {
        GObject *obj;
        GtkWidget *w;
@@ -259,12 +259,12 @@ modest_transport_widget_get_servername (ModestTransportWidget *self)
 }
 
 
-ModestProtocol
+ModestTransportStoreProtocol
 modest_transport_widget_get_proto (ModestTransportWidget *self)
 {
        ModestTransportWidgetPrivate *priv;
 
-       g_return_val_if_fail (self, MODEST_PROTOCOL_UNKNOWN);
+       g_return_val_if_fail (self, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
        priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(self);
 
        return priv->proto;