2007-05-15 Murray Cumming <murrayc@murrayc.com>
+ * src/modest-protocol-info.c:
+ * src/modest-protocol-info.h: Adde enum-specific get functions,
+ instead of using a ModestProtocolType enum parameter.
+
+ * src/gnome/modest-account-assistant.c:
+ * src/gnome/modest-store-widget.c:
+ * src/gnome/modest-store-widget.h:
+ * src/gnome/modest-transport-widget.c:
+ * src/gnome/modest-transport-widget.h:
+ * src/maemo/easysetup/modest-easysetup-servertype-combo-box.c:
+ * src/maemo/easysetup/modest-easysetup-servertype-combo-box.h:
+ * src/maemo/easysetup/modest-easysetup-wizard.c:
+ * src/maemo/modest-account-settings-dialog.c:
+ * src/maemo/modest-account-settings-dialog.h:
+ * src/maemo/modest-store-widget.c:
+ * src/maemo/modest-store-widget.h:
+ * src/maemo/modest-transport-widget.c:
+ * src/maemo/modest-transport-widget.h:
+ * src/modest-account-mgr-helpers.c:
+ * src/modest-account-mgr-helpers.h:
+ * src/modest-account-mgr.c:
+ * src/modest-account-mgr.h:
+ * src/modest-tny-account.c:
+ * src/modest-tny-folder.c:
+ * src/widgets/modest-account-view.c:
+ * src/widgets/modest-retrieve-combo-box.c:
+ * src/widgets/modest-retrieve-combo-box.h:
+ * src/widgets/modest-secureauth-combo-box.c:
+ * src/widgets/modest-serversecurity-combo-box.c:
+ * src/widgets/modest-serversecurity-combo-box.h:
+ * tests/check_account-mgr.c:
+ Use the specific functions, and use the re-renamed enum values for GNOME too.
+
+2007-05-15 Murray Cumming <murrayc@murrayc.com>
+
* src/modest-pair.h:
* src/modest-pair.c: Added modest_pair_list_find_by_first_as_string(),
so we can get the second based on the first.
{
ModestAccountAssistantPrivate *priv;
gchar *chosen;
- ModestProtocol proto;
+ ModestTransportStoreProtocol proto;
priv = MODEST_ACCOUNT_ASSISTANT_GET_PRIVATE(self);
chosen = gtk_combo_box_get_active_text (GTK_COMBO_BOX(combo));
gtk_container_remove (GTK_CONTAINER(priv->store_holder),
priv->store_widget);
- proto = modest_protocol_info_get_protocol (chosen);
+ proto = modest_protocol_info_get_transport_store_protocol (chosen);
/* FIXME: we could have these widgets cached instead of
creating them every time */
gtk_label_new(_("Server type")),
FALSE,FALSE,6);
- protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_STORE);
+ protos = modest_protocol_info_get_transport_store_protocol_pair_list (MODEST_PROTOCOL_TYPE_STORE);
combo = modest_combo_box_new (protos, g_str_equal);
modest_pair_list_free (protos);
gtk_container_remove (GTK_CONTAINER(priv->transport_holder),
priv->transport_widget);
priv->transport_widget =
- modest_transport_widget_new (modest_protocol_info_get_protocol(chosen));
+ modest_transport_widget_new (modest_protocol_info_get_transport_store_protocol(chosen));
gtk_container_add (GTK_CONTAINER(priv->transport_holder),
priv->transport_widget);
gtk_label_new(_("Server type")),
FALSE,FALSE,0);
- protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_TRANSPORT);
+ protos = modest_protocol_info_get_transport_store_protocol_pair_list (MODEST_PROTOCOL_TYPE_TRANSPORT);
combo = modest_combo_box_new (protos, g_str_equal);
modest_pair_list_free (protos);
* somewhere else
*/
static gchar*
-get_account_uri (ModestProtocol proto, const gchar* path)
+get_account_uri (ModestTransportStoreProtocol proto, const gchar* path)
{
CamelURL *url;
gchar *uri;
}
static gchar*
-get_new_server_account_name (ModestAccountMgr* acc_mgr, ModestProtocol proto,
+get_new_server_account_name (ModestAccountMgr* acc_mgr, ModestTransportStoreProtocol proto,
const gchar* username, const gchar *servername)
{
gchar *name;
while (TRUE) {
name = g_strdup_printf ("%s:%d",
- modest_protocol_info_get_protocol_name(proto), i++);
+ modest_protocol_info_get_transport_store_protocol_name(proto), i++);
if (modest_account_mgr_account_exists (acc_mgr, name, TRUE))
g_free (name);
else
on_apply (ModestAccountAssistant *self, gpointer user_data)
{
ModestAccountAssistantPrivate *priv;
- ModestProtocol proto = MODEST_PROTOCOL_UNKNOWN;
- ModestSecureConnection security = MODEST_PROTOCOL_SECURITY_NONE;
- ModestSecureAuthentication auth = MODEST_PROTOCOL_AUTH_NONE;
+ ModestTransportStoreProtocol proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
+ ModestAuthProtocol security = MODEST_PROTOCOL_SECURITY_NONE;
+ ModestConnectionProtocol auth = MODEST_PROTOCOL_AUTH_NONE;
gchar *store_name, *transport_name;
const gchar *account_name, *username, *servername, *path;
ModestStoreWidget *store;
GtkWidget *auth;
GtkWidget *chooser;
- ModestProtocol proto;
+ ModestTransportStoreProtocol proto;
};
#define MODEST_STORE_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_STORE_WIDGET, \
ModestStoreWidgetPrivate *priv;
priv = MODEST_STORE_WIDGET_GET_PRIVATE(obj);
- priv->proto = MODEST_PROTOCOL_UNKNOWN;
+ priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
}
gtk_label_set_markup (GTK_LABEL(label),_("<b>Security</b>"));
gtk_box_pack_start (GTK_BOX(box), label, FALSE, FALSE, 0);
- protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_SECURITY);
+ protos = modest_protocol_info_get_connection_protocol_pair_list ();
priv->security = modest_combo_box_new (protos, g_str_equal);
modest_pair_list_free (protos);
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 (;
priv->auth = modest_combo_box_new (protos, g_str_equal);
modest_pair_list_free (protos);
GtkWidget*
-modest_store_widget_new (ModestProtocol proto)
+modest_store_widget_new (ModestTransportStoreProtocol proto)
{
GObject *obj;
GtkWidget *w;
}
-ModestProtocol
+ModestTransportStoreProtocol
modest_store_widget_get_proto (ModestStoreWidget *self)
{
ModestStoreWidgetPrivate *priv;
- g_return_val_if_fail (self, MODEST_PROTOCOL_UNKNOWN);
+ g_return_val_if_fail (self, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
return priv->proto;
{
ModestStoreWidgetPrivate *priv;
- g_return_val_if_fail (self, MODEST_PROTOCOL_UNKNOWN);
+ g_return_val_if_fail (self, NULL);
priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
if (GTK_IS_FILE_CHOOSER(priv->chooser))
gchar *chosen;
if (!combo)
- return MODEST_PROTOCOL_UNKNOWN;
+ return -1;
chosen = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo));
- return modest_protocol_info_get_protocol (chosen);
+ return modest_protocol_info_get_transport_store_protocol (chosen);
}
-ModestSecureAuthentication
+ModestAuthProtocol
modest_store_widget_get_auth (ModestStoreWidget *self)
{
ModestStoreWidgetPrivate *priv;
- g_return_val_if_fail (self, MODEST_PROTOCOL_UNKNOWN);
+ g_return_val_if_fail (self, MODEST_PROTOCOL_AUTH_NONE);
priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
return get_value_from_combo (priv->auth);
}
-ModestSecureConnection
+ModestConnectionProtocol
modest_store_widget_get_security (ModestStoreWidget *self)
{
ModestStoreWidgetPrivate *priv;
- g_return_val_if_fail (self, MODEST_PROTOCOL_UNKNOWN);
+ g_return_val_if_fail (self, MODEST_PROTOCOL_CONNECTION_NORMAL);
priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
return get_value_from_combo (priv->security);
/* member functions */
GType modest_store_widget_get_type (void) G_GNUC_CONST;
-GtkWidget* modest_store_widget_new (ModestProtocol proto);
+GtkWidget* modest_store_widget_new (ModestTransportStoreProtocol proto);
const gchar* modest_store_widget_get_username (ModestStoreWidget *self);
const gchar* modest_store_widget_get_servername (ModestStoreWidget *self);
-ModestProtocol modest_store_widget_get_proto (ModestStoreWidget *self);
+ModestTransportStoreProtocol modest_store_widget_get_proto (ModestStoreWidget *self);
gchar * modest_store_widget_get_path (ModestStoreWidget *self);
-ModestSecureAuthentication modest_store_widget_get_auth (ModestStoreWidget *self);
-ModestSecureConnection modest_store_widget_get_security (ModestStoreWidget *self);
+ModestConnectionProtocol modest_store_widget_get_auth (ModestStoreWidget *self);
+ModestAuthProtocol modest_store_widget_get_security (ModestStoreWidget *self);
G_END_DECLS
typedef struct _ModestTransportWidgetPrivate ModestTransportWidgetPrivate;
struct _ModestTransportWidgetPrivate {
- ModestProtocol proto;
+ ModestTransportStoreProtocol proto;
GtkWidget *servername;
GtkWidget *username;
GtkWidget *auth;
ModestTransportWidgetPrivate *priv;
priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(obj);
- priv->proto = MODEST_PROTOCOL_UNKNOWN;
+ priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
}
static void
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);
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);
GtkWidget*
-modest_transport_widget_new (ModestProtocol proto)
+modest_transport_widget_new (ModestTransportStoreProtocol proto)
{
GObject *obj;
GtkWidget *w;
}
-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;
/* member functions */
GType modest_transport_widget_get_type (void) G_GNUC_CONST;
-GtkWidget* modest_transport_widget_new (ModestProtocol proto);
+GtkWidget* modest_transport_widget_new (ModestTransportStoreProtocol proto);
gboolean modest_transport_widget_get_remember_password (ModestTransportWidget *self);
gboolean modest_transport_widget_get_requires_auth (ModestTransportWidget *self);
const gchar* modest_transport_widget_get_username (ModestTransportWidget *self);
const gchar* modest_transport_widget_get_servername (ModestTransportWidget *self);
-ModestProtocol modest_transport_widget_get_proto (ModestTransportWidget *self);
+ModestTransportStoreProtocol modest_transport_widget_get_proto (ModestTransportWidget *self);
G_END_DECLS
/**
* Returns the selected servertype,
- * or MODEST_PROTOCOL_UNKNOWN if no servertype was selected.
+ * or MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN if no servertype was selected.
*/
-ModestProtocol
+ModestTransportStoreProtocol
easysetup_servertype_combo_box_get_active_servertype (EasysetupServertypeComboBox *combobox)
{
GtkTreeIter active;
if (found) {
EasysetupServertypeComboBoxPrivate *priv = SERVERTYPE_COMBO_BOX_GET_PRIVATE (combobox);
- ModestProtocol servertype = MODEST_PROTOCOL_UNKNOWN;
+ ModestTransportStoreProtocol servertype = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
gtk_tree_model_get (priv->model, &active, MODEL_COL_ID, &servertype, -1);
return servertype;
}
- return MODEST_PROTOCOL_UNKNOWN; /* Failed. */
+ return MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; /* Failed. */
}
/* This allows us to pass more than one piece of data to the signal handler,
/**
* Selects the specified servertype,
- * or MODEST_PROTOCOL_UNKNOWN if no servertype was selected.
+ * or MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN if no servertype was selected.
*/
gboolean
-easysetup_servertype_combo_box_set_active_servertype (EasysetupServertypeComboBox *combobox, ModestProtocol servertype)
+easysetup_servertype_combo_box_set_active_servertype (EasysetupServertypeComboBox *combobox, ModestTransportStoreProtocol servertype)
{
EasysetupServertypeComboBoxPrivate *priv = SERVERTYPE_COMBO_BOX_GET_PRIVATE (combobox);
EasysetupServertypeComboBox* easysetup_servertype_combo_box_new (void);
-ModestProtocol easysetup_servertype_combo_box_get_active_servertype (EasysetupServertypeComboBox *combobox);
+ModestTransportStoreProtocol easysetup_servertype_combo_box_get_active_servertype (EasysetupServertypeComboBox *combobox);
-gboolean easysetup_servertype_combo_box_set_active_servertype (EasysetupServertypeComboBox *combobox, ModestProtocol servertype);
+gboolean easysetup_servertype_combo_box_set_active_servertype (EasysetupServertypeComboBox *combobox, ModestTransportStoreProtocol servertype);
G_END_DECLS
*/
static void update_incoming_server_title (ModestEasysetupWizardDialog *self)
{
- const ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
+ const ModestTransportStoreProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
const gchar* type =
(protocol == MODEST_PROTOCOL_STORE_POP ?
*/
static void update_incoming_server_security_choices (ModestEasysetupWizardDialog *self)
{
- const ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
+ const ModestTransportStoreProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
/* Fill the combo with appropriately titled choices for POP or IMAP. */
static gchar*
-util_get_default_servername_from_email_address (const gchar* email_address, ModestProtocol servertype)
+util_get_default_servername_from_email_address (const gchar* email_address, ModestTransportStoreProtocol servertype)
{
if (!email_address)
return NULL;
const gchar* incoming_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_incomingserver));
if ((!incoming_existing || (strlen(incoming_existing) == 0))
&& account_wizard->entry_user_email) {
- const ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
+ const ModestTransportStoreProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
EASYSETUP_SERVERTYPE_COMBO_BOX (account_wizard->combo_incoming_servertype));
const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email));
const gchar* password = gtk_entry_get_text (GTK_ENTRY (self->entry_user_password));
/* Incoming server: */
- /* Note: We need something as default for the ModestProtocol* values,
+ /* Note: We need something as default for the ModestTransportStoreProtocol* values,
* or modest_account_mgr_add_server_account will fail. */
gchar* servername_incoming = NULL;
- ModestProtocol protocol_incoming = MODEST_PROTOCOL_STORE_POP;
+ ModestTransportStoreProtocol protocol_incoming = MODEST_PROTOCOL_STORE_POP;
ModestConnectionProtocol protocol_security_incoming = MODEST_PROTOCOL_CONNECTION_NORMAL;
ModestAuthProtocol protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_NONE;
/* Outgoing server: */
gchar* servername_outgoing = NULL;
- ModestProtocol protocol_outgoing = MODEST_PROTOCOL_STORE_POP;
+ ModestTransportStoreProtocol protocol_outgoing = MODEST_PROTOCOL_STORE_POP;
ModestConnectionProtocol protocol_security_outgoing = MODEST_PROTOCOL_CONNECTION_NORMAL;
ModestAuthProtocol protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_NONE;
/** Change the caption title for the incoming server,
* as specified in the UI spec:
*/
-static void update_incoming_server_title (ModestAccountSettingsDialog *self, ModestProtocol protocol)
+static void update_incoming_server_title (ModestAccountSettingsDialog *self, ModestTransportStoreProtocol protocol)
{
const gchar* type =
(protocol == MODEST_PROTOCOL_STORE_POP ?
/** Change the caption title for the incoming server,
* as specified in the UI spec:
*/
-static void update_incoming_server_security_choices (ModestAccountSettingsDialog *self, ModestProtocol protocol)
+static void update_incoming_server_security_choices (ModestAccountSettingsDialog *self, ModestTransportStoreProtocol protocol)
{
/* Fill the combo with appropriately titled choices for POP or IMAP. */
/* The choices are the same, but the titles are different, as in the UI spec. */
dialog->modified = FALSE;
}
-static GList* get_supported_secure_authentication_methods (ModestProtocol proto,
+static GList* get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto,
const gchar* hostname, gint port, GtkWindow *parent_window);
static gboolean
ModestPair *matching = modest_pair_list_find_by_first_as_string (pairs,
auth_name);
if (matching)
- g_list_append (result, GINT_TO_POINTER((ModestSecureAuthentication)matching->second));
+ g_list_append (result, GINT_TO_POINTER((ModestConnectionProtocol)matching->second));
iter = g_list_next (iter);
}
#endif
-static GList* get_supported_secure_authentication_methods (ModestProtocol proto,
+static GList* get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto,
const gchar* hostname, gint port, GtkWindow *parent_window)
{
return NULL;
/* TODO: Enable this when tinymail has the API: */
#if 0
- g_return_val_if_fail (proto != MODEST_PROTOCOL_UNKNOWN, NULL);
+ g_return_val_if_fail (proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN, NULL);
/*
result = g_list_append (result, GINT_TO_POINTER (MODEST_PROTOCOL_AUTH_CRAMMD5));
* set_session(): */
/* TODO: Why isn't this done in account_new()? */
tny_account_set_proto (tny_account,
- modest_protocol_info_get_protocol_name(proto));
+ modest_protocol_info_get_transport_store_protocol_name(proto));
/* Set the session for the account, so we can use it: */
ModestTnyAccountStore *account_store = modest_runtime_get_account_store ();
gboolean modified;
gchar * account_name; /* This may not change. It is not user visible. */
- ModestProtocol incoming_protocol; /* This may not change. */
- ModestProtocol outgoing_protocol; /* This may not change. */
+ ModestTransportStoreProtocol incoming_protocol; /* This may not change. */
+ ModestTransportStoreProtocol outgoing_protocol; /* This may not change. */
gchar * original_account_title;
GtkWidget *page_account_details;
GtkWidget *chooser;
GtkWidget *remember_pwd;
- ModestProtocol proto;
+ ModestTransportStoreProtocol proto;
};
#define MODEST_STORE_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_STORE_WIDGET, \
ModestStoreWidgetPrivate *priv;
priv = MODEST_STORE_WIDGET_GET_PRIVATE(obj);
- priv->proto = MODEST_PROTOCOL_UNKNOWN;
+ priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
}
gtk_label_set_markup (GTK_LABEL(label),_("<b>Security</b>"));
gtk_box_pack_start (GTK_BOX(box), label, FALSE, FALSE, 0);
- protos = modest_protocol_info_get_protocol_pair_list (MODEST_CONNECTION_PROTOCOL);
+ protos = modest_protocol_info_get_connection_protocol_pair_list ();
priv->security = modest_combo_box_new (protos, g_str_equal);
modest_pair_list_free (protos);
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_AUTH_PROTOCOL);
+ protos = modest_protocol_info_get_transport_store_protocol_pair_list ();
combo = modest_combo_box_new (protos, g_str_equal);
modest_pair_list_free (protos);
GtkWidget*
-modest_store_widget_new (ModestProtocol proto)
+modest_store_widget_new (ModestTransportStoreProtocol proto)
{
GObject *obj;
GtkWidget *w;
}
-ModestProtocol
+ModestTransportStoreProtocol
modest_store_widget_get_proto (ModestStoreWidget *self)
{
ModestStoreWidgetPrivate *priv;
- g_return_val_if_fail (self, MODEST_PROTOCOL_UNKNOWN);
+ g_return_val_if_fail (self, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
return priv->proto;
/* member functions */
GType modest_store_widget_get_type (void) G_GNUC_CONST;
-GtkWidget* modest_store_widget_new (ModestProtocol proto);
+GtkWidget* modest_store_widget_new (ModestTransportStoreProtocol proto);
gboolean modest_store_widget_get_remember_password (ModestStoreWidget *self);
const gchar* modest_store_widget_get_username (ModestStoreWidget *self);
const gchar* modest_store_widget_get_servername (ModestStoreWidget *self);
-ModestProtocol modest_store_widget_get_proto (ModestStoreWidget *self);
+ModestTransportStoreProtocol modest_store_widget_get_proto (ModestStoreWidget *self);
gchar * modest_store_widget_get_path (ModestStoreWidget *self);
typedef struct _ModestTransportWidgetPrivate ModestTransportWidgetPrivate;
struct _ModestTransportWidgetPrivate {
- ModestProtocol proto;
+ ModestTransportStoreProtocol proto;
GtkWidget *servername;
GtkWidget *username;
GtkWidget *auth;
ModestTransportWidgetPrivate *priv;
priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(obj);
- priv->proto = MODEST_PROTOCOL_UNKNOWN;
+ priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
}
static void
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_CONNECTION_PROTOCOL);
+ protos = modest_protocol_info_get_transport_store_protocol_pair_list ();
combo = modest_combo_box_new (protos, g_str_equal);
modest_pair_list_free (protos);
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_AUTH_PROTOCOL);
+ protos = modest_protocol_info_get_auth_protocol_pair_list ();
combo = modest_combo_box_new (protos, g_str_equal);
modest_pair_list_free (protos);
GtkWidget*
-modest_transport_widget_new (ModestProtocol proto)
+modest_transport_widget_new (ModestTransportStoreProtocol proto)
{
GObject *obj;
GtkWidget *w;
}
-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;
/* member functions */
GType modest_transport_widget_get_type (void) G_GNUC_CONST;
-GtkWidget* modest_transport_widget_new (ModestProtocol proto);
+GtkWidget* modest_transport_widget_new (ModestTransportStoreProtocol proto);
gboolean modest_transport_widget_get_remember_password (ModestTransportWidget *self);
gboolean modest_transport_widget_get_requires_auth (ModestTransportWidget *self);
const gchar* modest_transport_widget_get_username (ModestTransportWidget *self);
const gchar* modest_transport_widget_get_servername (ModestTransportWidget *self);
-ModestProtocol modest_transport_widget_get_proto (ModestTransportWidget *self);
+ModestTransportStoreProtocol modest_transport_widget_get_proto (ModestTransportWidget *self);
G_END_DECLS
data->hostname = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_HOSTNAME,TRUE);
data->username = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_USERNAME,TRUE);
proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE);
- data->proto = modest_protocol_info_get_protocol (proto, MODEST_TRANSPORT_STORE_PROTOCOL);
+ data->proto = modest_protocol_info_get_transport_store_protocol (proto);
g_free (proto);
data->port = modest_account_mgr_get_int (self, name, MODEST_ACCOUNT_PORT, TRUE);
gchar *hostname;
gchar *username;
gchar *uri; /*< Only for mbox and maildir accounts. */
- ModestProtocol proto; /*< The store or transport. Not ORed. */
+ ModestTransportStoreProtocol proto; /*< The store or transport. Not ORed. */
gchar *password;
time_t last_updated;
gint port; /* Or 0, if the default should be used. */
modest_account_mgr_add_server_account (ModestAccountMgr * self,
const gchar * name, const gchar *hostname,
const gchar * username, const gchar * password,
- ModestProtocol proto,
+ ModestTransportStoreProtocol proto,
ModestConnectionProtocol security,
ModestAuthProtocol auth)
{
/* proto */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE);
ok = modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_protocol_name(proto,
- MODEST_TRANSPORT_STORE_PROTOCOL),
+ modest_protocol_info_get_transport_store_protocol_name(proto),
&err);
if (err) {
g_printerr ("modest: failed to set %s: %s\n", key, err->message);
/* auth mechanism */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_AUTH_MECH, TRUE);
ok = modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_protocol_name (auth,
- MODEST_AUTH_PROTOCOL),
+ modest_protocol_info_get_auth_protocol_name (auth),
&err);
if (err) {
g_printerr ("modest: failed to set %s: %s\n", key, err->message);
*/
gboolean
modest_account_mgr_add_server_account_uri (ModestAccountMgr * self,
- const gchar *name, ModestProtocol proto,
+ const gchar *name, ModestTransportStoreProtocol proto,
const gchar *uri)
{
ModestAccountMgrPrivate *priv;
/* proto */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE);
ok = modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_protocol_name(proto, MODEST_TRANSPORT_STORE_PROTOCOL),
+ modest_protocol_info_get_transport_store_protocol_name(proto),
NULL);
g_free (key);
}
}
-
+#if 0
+/* Not used. */
GSList*
modest_account_mgr_search_server_accounts (ModestAccountMgr * self,
const gchar * account_name,
- ModestProtocolType type,
- ModestProtocol proto)
+ ModestTransportStoreProtocol proto)
{
GSList *accounts;
GSList *cursor;
while (cursor) {
gchar *account = _modest_account_mgr_account_from_key ((gchar*)cursor->data, NULL, NULL);
gchar *acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO,TRUE);
- ModestProtocol this_proto = modest_protocol_info_get_protocol (acc_proto,
- MODEST_TRANSPORT_STORE_PROTOCOL);
- if (this_proto != MODEST_PROTOCOL_UNKNOWN && this_proto != proto) {
+ ModestTransportStoreProtocol this_proto =
+ modest_protocol_info_get_transport_store_protocol (acc_proto);
+ if (this_proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN && this_proto != proto) {
GSList *nxt = cursor->next;
accounts = g_slist_delete_link (accounts, cursor);
cursor = nxt;
strip_prefix_from_elements (accounts, strlen(key)+1);
return accounts;
}
-
+#endif
GSList*
modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled)
const gchar *hostname,
const gchar *username,
const gchar *password,
- ModestProtocol proto,
+ ModestTransportStoreProtocol proto,
ModestConnectionProtocol security,
ModestAuthProtocol auth);
*/
gboolean modest_account_mgr_add_server_account_uri (ModestAccountMgr *self,
const gchar *name,
- ModestProtocol proto,
+ ModestTransportStoreProtocol proto,
const gchar* uri);
/**
GSList* modest_account_mgr_account_names (ModestAccountMgr *self,
gboolean only_enabled);
-
+#if 0
+/* Not used. */
/**
* modest_account_mgr_search_server_account:
* @self: a ModestAccountMgr instance
* @account_name: get only server accounts for @account_name, or NULL for any
* @type: get only server accounts from protocol type @type, or MODEST_PROTOCOL_TYPE_UNKNOWN
- * @proto: get only server account with protocol @proto, or MODEST_PROTOCOL_UNKNOWN for any
+ * @proto: get only server account with protocol @proto, or MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN for any
*
* List all the server account names, optionally narrowing the result down to one account.
*
GSList* modest_account_mgr_search_server_accounts (ModestAccountMgr *self,
const gchar* account_name,
ModestProtocolType type,
- ModestProtocol proto);
+ ModestTransportStoreProtocol proto);
+#endif
/**
* modest_account_mgr_account_exists:
typedef struct {
- ModestProtocol proto;
+ gint proto;
const gchar* name;
const gchar* display_name;
} ProtocolInfo;
};
-
-static const ProtocolInfo*
-get_map (ModestProtocolType proto_type, guint *size)
+static ModestPairList*
+get_protocol_pair_list (const ProtocolInfo* map, guint size)
{
- const ProtocolInfo *map = NULL;
-
- switch (proto_type) {
- case MODEST_TRANSPORT_STORE_PROTOCOL:
- map = TransportStoreProtocolMap;
- *size = G_N_ELEMENTS(TransportStoreProtocolMap);
- break;
- case MODEST_CONNECTION_PROTOCOL:
- map = ConnectionProtocolMap;
- *size = G_N_ELEMENTS(ConnectionProtocolMap);
- break;
- case MODEST_AUTH_PROTOCOL:
- map = AuthProtocolMap;
- *size = G_N_ELEMENTS(AuthProtocolMap);
- break;
- default:
- g_printerr ("modest: invalide protocol type %d", proto_type);
- }
- return map;
-}
-
+ g_return_val_if_fail (map, NULL);
-ModestPairList*
-modest_protocol_info_get_protocol_pair_list (ModestProtocolType proto_type)
-{
- const ProtocolInfo *map;
- ModestPairList *proto_list = NULL;
- guint size;
+ ModestPairList *proto_list = NULL;
int i;
-
- map = get_map (proto_type, &size);
- g_return_val_if_fail (map, NULL);
-
for (i = 0; i != size; ++i) {
const ProtocolInfo info = map[i];
proto_list = g_slist_append (proto_list,
}
-ModestProtocol
-modest_protocol_info_get_protocol (const gchar* name, ModestProtocolType proto_type)
+ModestPairList*
+modest_protocol_info_get_transport_store_protocol_pair_list ()
{
- const ProtocolInfo *map;
- guint size;
+ return get_protocol_pair_list (TransportStoreProtocolMap,
+ G_N_ELEMENTS(TransportStoreProtocolMap));
+}
+
+ModestPairList*
+modest_protocol_info_get_auth_protocol_pair_list ()
+{
+ return get_protocol_pair_list (AuthProtocolMap,
+ G_N_ELEMENTS(AuthProtocolMap));
+}
+
+ModestPairList*
+modest_protocol_info_get_connection_protocol_pair_list ()
+{
+ return get_protocol_pair_list (ConnectionProtocolMap,
+ G_N_ELEMENTS(ConnectionProtocolMap));
+}
+
+
+ModestTransportStoreProtocol
+modest_protocol_info_get_transport_store_protocol (const gchar* name)
+{
+ const ProtocolInfo *map = TransportStoreProtocolMap;
+ const guint size = G_N_ELEMENTS(TransportStoreProtocolMap);
int i;
- g_return_val_if_fail (name, MODEST_PROTOCOL_UNKNOWN);
+ g_return_val_if_fail (name, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
- map = get_map (proto_type, &size);
- g_return_val_if_fail (map, MODEST_PROTOCOL_UNKNOWN);
+ g_return_val_if_fail (map, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
for (i = 0; i != size; ++i) {
const ProtocolInfo info = map[i];
return info.proto;
}
- return MODEST_PROTOCOL_UNKNOWN;
+ return MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
}
/* get either the name or the display_name for the protocol */
static const gchar*
-get_protocol_string (ModestProtocol proto, gboolean get_name, ModestProtocolType proto_type)
+get_protocol_string (gint proto, const ProtocolInfo* map, guint size, gboolean get_name)
{
- const ProtocolInfo *map;
- guint size;
- int i;
-
- map = get_map (proto_type, &size);
g_return_val_if_fail (map, NULL);
+ int i;
for (i = 0; i != size; ++i) {
ProtocolInfo info = map[i];
if (info.proto == proto)
}
const gchar*
-modest_protocol_info_get_protocol_name (ModestProtocol proto, ModestProtocolType proto_type)
+modest_protocol_info_get_transport_store_protocol_name (ModestTransportStoreProtocol proto)
{
- return get_protocol_string (proto, TRUE, proto_type);
+ return get_protocol_string (proto, TransportStoreProtocolMap,
+ G_N_ELEMENTS(TransportStoreProtocolMap), TRUE);
}
+const gchar*
+modest_protocol_info_get_auth_protocol_name (ModestAuthProtocol proto)
+{
+ return get_protocol_string (proto, AuthProtocolMap,
+ G_N_ELEMENTS(AuthProtocolMap), TRUE);
+}
const gchar*
-modest_protocol_info_get_protocol_display_name (ModestProtocol proto, ModestProtocolType proto_type)
+modest_protocol_info_get_connection_protocol_name (ModestAuthProtocol proto)
{
- return get_protocol_string (proto, FALSE, proto_type);
+ return get_protocol_string (proto, ConnectionProtocolMap,
+ G_N_ELEMENTS(ConnectionProtocolMap), TRUE);
}
G_BEGIN_DECLS
+/** Transport and Store protocols. */
typedef enum {
+ MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN,
MODEST_PROTOCOL_TRANSPORT_SENDMAIL,
MODEST_PROTOCOL_TRANSPORT_SMTP,
MODEST_PROTOCOL_STORE_MAILDIR,
MODEST_PROTOCOL_STORE_MBOX
} ModestTransportStoreProtocol;
-
+
+/** Secure connection methods. */
typedef enum {
MODEST_PROTOCOL_CONNECTION_NORMAL,
MODEST_PROTOCOL_CONNECTION_SSL,
MODEST_PROTOCOL_CONNECTION_TLS_OP
} ModestConnectionProtocol;
+/** Secure authentication methods. */
typedef enum {
MODEST_PROTOCOL_AUTH_NONE,
MODEST_PROTOCOL_AUTH_PASSWORD,
MODEST_PROTOCOL_AUTH_CRAMMD5
} ModestAuthProtocol;
-typedef enum {
- MODEST_TRANSPORT_STORE_PROTOCOL,
- MODEST_CONNECTION_PROTOCOL,
- MODEST_AUTH_PROTOCOL
-} ModestProtocolType;
-typedef guint ModestProtocol;
-#define MODEST_PROTOCOL_UNKNOWN 666
+/**
+ * modest_protocol_info_get_transport_store_protocol_pair_list:
+ *
+ * return the list of <protocol,display-name>-tupels of protocols.
+ * The elements of the returned list are ModestPairs
+ * This is a convenience function for use with ModestComboBox
+ *
+ * Returns: a list of protocols. After use, it should be freed
+ * with modest_pair_list_free
+ */
+ModestPairList*
+modest_protocol_info_get_transport_store_protocol_pair_list ();
/**
- * modest_protocol_info_get_protocol_pair_list:
- * @proto_type: the type of protocol you want to have
+ * modest_protocol_info_get_auth_protocol_pair_list:
*
* return the list of <protocol,display-name>-tupels of protocols.
* The elements of the returned list are ModestPairs
* Returns: a list of protocols. After use, it should be freed
* with modest_pair_list_free
*/
-ModestPairList* modest_protocol_info_get_protocol_pair_list (ModestProtocolType proto_type);
+ModestPairList*
+modest_protocol_info_get_auth_protocol_pair_list ();
+
/**
- * modest_protocol_info_get_protocol_type:
- * @name: the name of the ModestProtocol
+ * modest_protocol_info_get_connection_protocol_pair_list:
+ *
+ * return the list of <protocol,display-name>-tupels of protocols.
+ * The elements of the returned list are ModestPairs
+ * This is a convenience function for use with ModestComboBox
+ *
+ * Returns: a list of protocols. After use, it should be freed
+ * with modest_pair_list_free
+ */
+ModestPairList*
+modest_protocol_info_get_connection_protocol_pair_list ();
+
+
+/**
+ * modest_protocol_info_get_transport_store_protocol:
+ * @name: the name of the ModestTransportStoreProtocol
* @proto_type: the type of protocol you want to have
*
* return the id of the protocol with the given name
*
- * Returns: the id of the protocol or MODEST_PROTOCOL_UNKNOWN
+ * Returns: the id of the protocol or MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN
*/
-ModestProtocol modest_protocol_info_get_protocol (const gchar* name, ModestProtocolType proto_type);
+ModestTransportStoreProtocol
+modest_protocol_info_get_transport_store_protocol (const gchar* name);
/**
- * modest_protocol_info_get_protocol_name:
+ * modest_protocol_info_get_transport_store_protocol_name:
* @proto: the protocol you are looking for
- * @proto_type: the type of protocol you want to have
*
- * return the string id of the proto (such as "imap", or "tls")
+ * return the string id of the proto (such as "imap", or "smtp")
*
* Returns: string id of the proto as a constant string, that should NOT be modified or freed
*/
-const gchar* modest_protocol_info_get_protocol_name (ModestProtocol proto,
- ModestProtocolType proto_type);
+const gchar*
+modest_protocol_info_get_transport_store_protocol_name (ModestTransportStoreProtocol proto);
/**
- * modest_protocol_info_get_protocol_display_name:
+ * modest_protocol_info_get_auth_protocol_name:
* @proto: the protocol you are looking for
- * @proto_type: the type of protocol you want to have
- *
- * return the string id of the proto (such as "imap", or "tls")
+ *
+ * return the string id of the proto (such as "password", or "cram-md5")
*
* Returns: string id of the proto as a constant string, that should NOT be modified or freed
- *
*/
-const gchar* modest_protocol_info_get_protocol_display_name (ModestProtocol proto,
- ModestProtocolType proto_type);
+const gchar*
+modest_protocol_info_get_auth_protocol_name (ModestAuthProtocol proto);
+/**
+ * modest_protocol_info_get_auth_protocol_name:
+ * @proto: the protocol you are looking for
+ *
+ * return the string id of the proto (such as "ssl", or "tls")
+ *
+ * Returns: string id of the proto as a constant string, that should NOT be modified or freed
+ */
+const gchar*
+modest_protocol_info_get_connection_protocol_name (ModestAuthProtocol proto);
/**
g_return_val_if_fail (account_data, NULL);
/* sanity checks */
- if (account_data->proto == MODEST_PROTOCOL_UNKNOWN) {
+ if (account_data->proto == MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN) {
g_printerr ("modest: '%s' does not provide a protocol\n",
account_data->account_name);
return NULL;
tny_account_set_id (tny_account, account_data->account_name);
/* Proto */
- tny_account_set_proto (tny_account,
- modest_protocol_info_get_protocol_name(account_data->proto,
- MODEST_TRANSPORT_STORE_PROTOCOL));
+ const gchar* proto_name = modest_protocol_info_get_transport_store_protocol_name(account_data->proto);
+ tny_account_set_proto (tny_account, proto_name);
/* mbox and maildir accounts use a URI instead of the rest: */
rules |= MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE;
}
} else {
- ModestProtocol proto;
+ ModestTransportStoreProtocol proto;
TnyAccount *account =
tny_folder_get_account ((TnyFolder*)folder);
if (!account)
return -1; /* no account: nothing is allowed */
- proto = modest_protocol_info_get_protocol (tny_account_get_proto (account),
- MODEST_TRANSPORT_STORE_PROTOCOL);
+ proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
if (proto == MODEST_PROTOCOL_STORE_IMAP) {
rules = 0;
MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, account_data->is_default,
MODEST_ACCOUNT_VIEW_PROTO_COLUMN,
- modest_protocol_info_get_protocol_name (account_data->store_account->proto,
- MODEST_TRANSPORT_STORE_PROTOCOL),
+ modest_protocol_info_get_transport_store_protocol_name (account_data->store_account->proto),
MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
-1);
MODEL_COL_CONF_NAME = 1 /* a string */
};
-void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestProtocol protocol);
+void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestTransportStoreProtocol protocol);
static void
modest_retrieve_combo_box_init (ModestRetrieveComboBox *self)
* #combobox: The combo box.
* @protocol: IMAP or POP.
*/
-void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestProtocol protocol)
+void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestTransportStoreProtocol protocol)
{
ModestRetrieveComboBoxPrivate *priv = RETRIEVE_COMBO_BOX_GET_PRIVATE (combobox);
ModestRetrieveComboBox* modest_retrieve_combo_box_new (void);
-void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestProtocol protocol);
+void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestTransportStoreProtocol protocol);
gchar* modest_retrieve_combo_box_get_active_retrieve_conf (ModestRetrieveComboBox *combobox);
if (found) {
ModestSecureauthComboBoxPrivate *priv = SECUREAUTH_COMBO_BOX_GET_PRIVATE (combobox);
- ModestProtocol secureauth = MODEST_PROTOCOL_AUTH_NONE;
+ ModestAuthProtocol secureauth = MODEST_PROTOCOL_AUTH_NONE;
gtk_tree_model_get (priv->model, &active, MODEL_COL_ID, &secureauth, -1);
return secureauth;
}
/**
* 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, ModestAuthProtocol secureauth)
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. */
}
}
-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,
ModestServersecurityComboBox* modest_serversecurity_combo_box_new (void);
-void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobox, ModestProtocol protocol);
+void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobox, ModestTransportStoreProtocol protocol);
ModestConnectionProtocol modest_serversecurity_combo_box_get_active_serversecurity (ModestServersecurityComboBox *combobox);
gchar *hostname = NULL;
gchar *username = NULL;
gchar *password = NULL;
- ModestProtocol proto;
+ ModestTransportStoreProtocol proto;
gboolean result;
name = g_strdup (TEST_MODEST_ACCOUNT_NAME);
projects / modest / commitdiff