struct _ModestServersecurityComboBoxPrivate
{
GtkTreeModel *model;
- ModestProtocol protocol;
+ ModestConnectionProtocol protocol;
};
static 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. */
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: */
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;
/**
* 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,