#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <widgets/modest-combo-box.h>
-#include <modest-protocol-info.h>
#include "modest-transport-widget.h"
#include <string.h>
typedef struct _ModestTransportWidgetPrivate ModestTransportWidgetPrivate;
struct _ModestTransportWidgetPrivate {
- ModestTransportStoreProtocol proto;
+ ModestProtocolType proto;
GtkWidget *servername;
GtkWidget *username;
GtkWidget *auth;
GtkWidget *remember_pwd;
ModestPairList *transport_store_protos;
+ ModestPairList *auth_protos;
};
#define MODEST_TRANSPORT_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_TRANSPORT_WIDGET, \
ModestTransportWidgetPrivate *priv;
priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(obj);
- priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
+ priv->proto = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
}
static void
{
ModestTransportWidgetPrivate *priv;
GtkWidget *label, *box, *hbox, *combo;
+ const gchar *tag = MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS;
priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(self);
box = gtk_vbox_new (FALSE, 6);
/* Note: This ModestPairList* must exist for as long as the combo
* that uses it, because the ModestComboBox uses the ID opaquely,
* so it can't know how to manage its memory. */
- priv->transport_store_protos = modest_protocol_info_get_transport_store_protocol_pair_list ();
+ priv->transport_store_protos = modest_gnome_utils_get_protocols_pair_list (tag);
combo = modest_combo_box_new (priv->transport_store_protos, g_str_equal);
gtk_box_pack_start (GTK_BOX(hbox), combo, FALSE, FALSE,0);
/* Note: This ModestPairList* must exist for as long as the combo
* that uses it, because the ModestComboBox uses the ID opaquely,
* so it can't know how to manage its memory. */
- priv->auth_protos = modest_protocol_info_get_auth_protocol_pair_list ();
+ tag = MODEST_PROTOCOL_REGISTRY_AUTH_PROTOCOLS;
+ priv->auth_protos = modest_gnome_utils_get_protocols_pair_list (tag);
combo = modest_combo_box_new (priv->auth_protos, g_str_equal);
gtk_box_pack_start (GTK_BOX(hbox), combo, FALSE, FALSE, 0);
GtkWidget*
-modest_transport_widget_new (ModestTransportStoreProtocol proto)
+modest_transport_widget_new (ModestProtocolType proto)
{
GObject *obj;
GtkWidget *w;
priv->proto = proto;
- if (proto == MODEST_PROTOCOL_TRANSPORT_SMTP)
+ if (proto == MODEST_PROTOCOLS_TRANSPORT_SMTP)
w = smtp_configuration (self);
else
w = gtk_label_new ("");
}
-ModestTransportStoreProtocol
+ModestProtocolType
modest_transport_widget_get_proto (ModestTransportWidget *self)
{
ModestTransportWidgetPrivate *priv;
- g_return_val_if_fail (self, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
+ g_return_val_if_fail (self, MODEST_PROTOCOL_REGISTRY_TYPE_INVALID);
priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(self);
return priv->proto;