* src/widgets/modest-msg-view.c:

[modest] / src / widgets / modest-serversecurity-combo-box.c

diff --git a/src/widgets/modest-serversecurity-combo-box.c b/src/widgets/modest-serversecurity-combo-box.c
index c5e39c2..fda07d9 100644 (file)
--- a/src/widgets/modest-serversecurity-combo-box.c
+++ b/src/widgets/modest-serversecurity-combo-box.c
@@ -52,7 +52,7 @@ typedef struct _ModestServersecurityComboBoxPrivate ModestServersecurityComboBox
 struct _ModestServersecurityComboBoxPrivate
 {
        GtkTreeModel *model;
-       ModestProtocol protocol;
+       ModestConnectionProtocol protocol;
 };
 
 static void
@@ -146,8 +146,8 @@ modest_serversecurity_combo_box_new (void)
  * #combobox: The combo box.
  * @protocol: IMAP or POP.
  */
-void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobox, ModestProtocol protocol)
-{      
+void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobox, ModestTransportStoreProtocol protocol)
+{
        ModestServersecurityComboBoxPrivate *priv = SERVERSECURITY_COMBO_BOX_GET_PRIVATE (combobox);
        priv->protocol = protocol; /* Remembered for later. */
        
@@ -157,6 +157,7 @@ void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobo
        
        GtkTreeIter iter;
        gtk_list_store_append (liststore, &iter);
+       /* TODO: This logical ID is not in the .po file: */
        gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_NORMAL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_none"), -1);
        
        /* Select the None item: */
@@ -172,14 +173,14 @@ void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobo
                gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_securepop3s"), -1);
        } else if(protocol == MODEST_PROTOCOL_STORE_IMAP) {
                gtk_list_store_append (liststore, &iter);
-               gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_secureimap4"), -1);
+               gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_secureimap4s"), -1);
        } else if(protocol == MODEST_PROTOCOL_TRANSPORT_SMTP) {
                gtk_list_store_append (liststore, &iter);
                gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_ssl"), -1);
        }
 }
 
-static gint get_port_for_security (ModestProtocol protocol, ModestConnectionProtocol security)
+static gint get_port_for_security (ModestTransportStoreProtocol protocol, ModestConnectionProtocol security)
 {
        /* See the UI spec, section Email Wizards, Incoming Details [MSG-WIZ001]: */
        gint result = 0;
@@ -269,7 +270,7 @@ on_model_foreach_select_id(GtkTreeModel *model,
 
 /**
  * Selects the specified serversecurity, 
- * or MODEST_PROTOCOL_UNKNOWN if no serversecurity was selected.
+ * or MODEST_PROTOCOL_CONNECTION_NORMAL if no serversecurity was selected.
  */
 gboolean
 modest_serversecurity_combo_box_set_active_serversecurity (ModestServersecurityComboBox *combobox,