X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgnome%2Fmodest-transport-widget.c;h=16271fc7141d3528fb18340dca1cf7d83b5d5a59;hb=ff5c90409a7511dcf1839d988f7b9e4467fa55f9;hp=69e900e32f4c830d6d86a79d5178702cfe6be1a0;hpb=3e7a3b4e5759d63285d8795435b2ceedaf63b216;p=modest

diff --git a/src/gnome/modest-transport-widget.c b/src/gnome/modest-transport-widget.c
index 69e900e..16271fc 100644
--- a/src/gnome/modest-transport-widget.c
+++ b/src/gnome/modest-transport-widget.c
@@ -24,11 +24,13 @@ enum {
 
 typedef struct _ModestTransportWidgetPrivate ModestTransportWidgetPrivate;
 struct _ModestTransportWidgetPrivate {
-	ModestProtocol proto;
+	ModestTransportStoreProtocol proto;
 	GtkWidget *servername;
 	GtkWidget *username;
 	GtkWidget *auth;
 	GtkWidget *remember_pwd;
+	
+	ModestPairList *transport_store_protos;
 };
 #define MODEST_TRANSPORT_WIDGET_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                      MODEST_TYPE_TRANSPORT_WIDGET, \
@@ -88,12 +90,17 @@ modest_transport_widget_init (ModestTransportWidget *obj)
 	ModestTransportWidgetPrivate *priv;
 	priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(obj); 
 	
-	priv->proto = MODEST_PROTOCOL_UNKNOWN;
+	priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
 }
 
 static void
 modest_transport_widget_finalize (GObject *obj)
 {
+	ModestTransportWidgetPrivate *priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(obj);
+	
+	/* These had to stay alive for as long as the comboboxes that used them: */
+	modest_pair_list_free (priv->transport_store_protos);
+	
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -116,7 +123,6 @@ smtp_configuration (ModestTransportWidget *self)
 {
 	ModestTransportWidgetPrivate *priv;
 	GtkWidget *label, *box, *hbox, *combo;
-	ModestPairList *protos;
 	
 	priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(self);
 	box = gtk_vbox_new (FALSE, 6);
@@ -160,9 +166,11 @@ smtp_configuration (ModestTransportWidget *self)
 	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);
-	combo  = modest_combo_box_new (protos, g_str_equal);
-	modest_pair_list_free (protos);
+	/* 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 ();
+	combo  = modest_combo_box_new (priv->transport_store_protos, g_str_equal);
 	
 	gtk_box_pack_start (GTK_BOX(hbox), combo, FALSE, FALSE,0);
 	gtk_box_pack_start (GTK_BOX(box), hbox, FALSE, FALSE, 0);
@@ -173,9 +181,11 @@ smtp_configuration (ModestTransportWidget *self)
 	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);
-	combo  = modest_combo_box_new (protos, g_str_equal);
-	modest_pair_list_free (protos);
+	/* 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 ();
+	combo  = modest_combo_box_new (priv->auth_protos, g_str_equal);
 	
 	gtk_box_pack_start (GTK_BOX(hbox), combo, FALSE, FALSE, 0);
 	priv->remember_pwd =
@@ -187,7 +197,7 @@ smtp_configuration (ModestTransportWidget *self)
 
 
 GtkWidget*
-modest_transport_widget_new (ModestProtocol proto)
+modest_transport_widget_new (ModestTransportStoreProtocol proto)
 {
 	GObject *obj;
 	GtkWidget *w;
@@ -259,12 +269,12 @@ modest_transport_widget_get_servername (ModestTransportWidget *self)
 }
 
 
-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;