X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-secureauth-combo-box.c;h=b18c2a06aabf929b8498076b68cb322cfd32b6c1;hb=ca5de6cffaee7b5cd3adeecad6edcda2bbf3c757;hp=c8cf9606801744b896e1f8ed8c2ecea0b3445757;hpb=49b6485b7693b07b4de3067d4a9c4e048da1be48;p=modest

diff --git a/src/widgets/modest-secureauth-combo-box.c b/src/widgets/modest-secureauth-combo-box.c
index c8cf960..b18c2a0 100644
--- a/src/widgets/modest-secureauth-combo-box.c
+++ b/src/widgets/modest-secureauth-combo-box.c
@@ -31,7 +31,7 @@ struct _ModestSecureauthComboBoxPrivate
 
 static void
 modest_secureauth_combo_box_get_property (GObject *object, guint property_id,
-															GValue *value, GParamSpec *pspec)
+					  GValue *value, GParamSpec *pspec)
 {
 	switch (property_id) {
 	default:
@@ -41,7 +41,7 @@ modest_secureauth_combo_box_get_property (GObject *object, guint property_id,
 
 static void
 modest_secureauth_combo_box_set_property (GObject *object, guint property_id,
-															const GValue *value, GParamSpec *pspec)
+					  const GValue *value, GParamSpec *pspec)
 {
 	switch (property_id) {
 	default:
@@ -131,23 +131,26 @@ void modest_secureauth_combo_box_fill (ModestSecureauthComboBox *combobox)
 	
 	GtkTreeIter iter;
 	gtk_list_store_append (liststore, &iter);
-	gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_AUTH_NONE, MODEL_COL_NAME, _("mcen_fi_advsetup_smtp_none"), -1);
+	gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_AUTH_NONE, MODEL_COL_NAME,
+			    _("mcen_fi_advsetup_smtp_none"), -1);
 	
 	/* Select the None item: */
 	gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), &iter);
 	
 	gtk_list_store_append (liststore, &iter);
-	gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_AUTH_PASSWORD, MODEL_COL_NAME, _("mcen_fi_advsetup_smtp_login"), -1);
+	gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_AUTH_PASSWORD, MODEL_COL_NAME,
+			    _("mcen_fi_advsetup_smtp_login"), -1);
 	
 	gtk_list_store_append (liststore, &iter);
-	gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_AUTH_CRAMMD5, MODEL_COL_NAME, _("mcen_fi_advsetup_smtp_cram_md5"), -1);
+	gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_AUTH_CRAMMD5, MODEL_COL_NAME,
+			    _("mcen_fi_advsetup_smtp_cram_md5"), -1);
 }
 
 /**
  * Returns the selected secureauth, 
- * or MODEST_PROTOCOL_UNKNOWN if no secureauth was selected.
+ * or MODEST_PROTOCOL_AUTH_NONE if no secureauth was selected.
  */
-ModestProtocol
+ModestAuthProtocol
 modest_secureauth_combo_box_get_active_secureauth (ModestSecureauthComboBox *combobox)
 {
 	GtkTreeIter active;
@@ -155,12 +158,12 @@ modest_secureauth_combo_box_get_active_secureauth (ModestSecureauthComboBox *com
 	if (found) {
 		ModestSecureauthComboBoxPrivate *priv = SECUREAUTH_COMBO_BOX_GET_PRIVATE (combobox);
 
-		ModestProtocol secureauth = MODEST_PROTOCOL_UNKNOWN;
+		ModestAuthProtocol secureauth = MODEST_PROTOCOL_AUTH_NONE;
 		gtk_tree_model_get (priv->model, &active, MODEL_COL_ID, &secureauth, -1);
 		return secureauth;	
 	}
 
-	return MODEST_PROTOCOL_UNKNOWN; /* Failed. */
+	return MODEST_PROTOCOL_AUTH_NONE; /* Failed. */
 }
 
 /* This allows us to pass more than one piece of data to the signal handler,
@@ -193,10 +196,10 @@ on_model_foreach_select_id(GtkTreeModel *model,
 
 /**
  * Selects the specified secureauth, 
- * or MODEST_PROTOCOL_UNKNOWN if no secureauth was selected.
+ * or MODEST_PROTOCOL_AUTH_NONE if no secureauth was selected.
  */
 gboolean
-modest_secureauth_combo_box_set_active_secureauth (ModestSecureauthComboBox *combobox, ModestProtocol secureauth)
+modest_secureauth_combo_box_set_active_secureauth (ModestSecureauthComboBox *combobox, ModestAuthProtocol secureauth)
 {
 	ModestSecureauthComboBoxPrivate *priv = SECUREAUTH_COMBO_BOX_GET_PRIVATE (combobox);