X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-protocol-registry.c;h=9e89763a229b98b80f90b56206ce383585519274;hb=e2769fe7a2bfef7080c538f3f98f6fd5520f45ac;hp=42ffcd69766ad2ce8b5c91f937fa0ae71410af29;hpb=aede4b15e958567feedcbd3d2e156dadf6087d7d;p=modest

diff --git a/src/modest-protocol-registry.c b/src/modest-protocol-registry.c
index 42ffcd6..9e89763 100644
--- a/src/modest-protocol-registry.c
+++ b/src/modest-protocol-registry.c
@@ -31,6 +31,7 @@
 #include <modest-account-protocol.h>
 #include <modest-defs.h>
 #include <modest-protocol-registry.h>
+#include <modest-transport-account-decorator.h>
 #include <tny-camel-pop-store-account.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-store-account.h>
@@ -298,7 +299,7 @@ modest_protocol_registry_get_pair_list_by_tag (ModestProtocolRegistry *self, con
 {
 	ModestProtocolRegistryPrivate *priv;
 	GHashTable *tag_table;
-	GSList *result;
+	GSList *result = NULL;
 
 	g_return_val_if_fail (MODEST_IS_PROTOCOL_REGISTRY (self), NULL);
 	priv = MODEST_PROTOCOL_REGISTRY_GET_PRIVATE (self);
@@ -310,7 +311,7 @@ modest_protocol_registry_get_pair_list_by_tag (ModestProtocolRegistry *self, con
 
 	g_hash_table_foreach (tag_table, (GHFunc) add_protocol_to_pair_list, &result);
 
-	return result;	
+	return result;
 }
 
 static gboolean
@@ -437,9 +438,10 @@ modest_protocol_registry_set_to_default (ModestProtocolRegistry *self)
 
 	protocol = modest_account_protocol_new ("smtp", N_("SMTP Server"),
 						25, 465,
-						TNY_TYPE_CAMEL_TRANSPORT_ACCOUNT);
+						MODEST_TYPE_TRANSPORT_ACCOUNT_DECORATOR);
 	smtp_protocol_type_id = modest_protocol_get_type_id (protocol);
 	modest_protocol_set_translation (protocol, MODEST_PROTOCOL_TRANSLATION_CONNECT_ERROR, translation_is_userdata, "emev_ib_ui_smtp_server_invalid", NULL);
+	modest_protocol_set_translation (protocol, MODEST_PROTOCOL_TRANSLATION_ACCOUNT_CONNECTION_ERROR, translation_is_userdata, "emev_ib_ui_smtp_server_invalid", NULL);
 	modest_protocol_set_translation (protocol, MODEST_PROTOCOL_TRANSLATION_AUTH_ERROR, translation_is_userdata, "emev_ni_ui_smtp_authentication_fail_error", NULL);
 	modest_protocol_registry_add (self, protocol, 2,
 				      MODEST_PROTOCOL_REGISTRY_TRANSPORT_STORE_PROTOCOLS,
@@ -461,7 +463,7 @@ modest_protocol_registry_set_to_default (ModestProtocolRegistry *self)
 				      MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS,
 				      MODEST_PROTOCOL_REGISTRY_REMOTE_STORE_PROTOCOLS,
 				      MODEST_PROTOCOL_REGISTRY_HAS_LEAVE_ON_SERVER_PROTOCOLS,
-				      MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD,
+				      MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS,
 				      NULL);
 	g_object_unref (protocol);