X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-protocol.c;h=a995db2428b540f87a00dbb5459614bcefc7a232;hp=ef7d1b7bc816ddc25c52ea524faea252a417fba6;hb=67ce358d84560f33210e608f236f258c38cb701c;hpb=ba4f63e1dede973582a3fa6add4cc390925ffea3

diff --git a/src/modest-account-protocol.c b/src/modest-account-protocol.c
index ef7d1b7..a995db2 100644
--- a/src/modest-account-protocol.c
+++ b/src/modest-account-protocol.c
@@ -93,10 +93,13 @@ static void modest_account_protocol_cancel_check_support_default (ModestAccountP
 static void modest_account_protocol_wizard_finished_default (ModestAccountProtocol *self);
 static gboolean modest_account_protocol_decode_part_to_stream_default (ModestAccountProtocol *protocol,
 								       TnyMimePart *part,
+								       const gchar *stream_uri,
 								       TnyStream *stream,
-								       GError *error);
+								       gssize *written,
+								       GError **error);
 static gboolean modest_account_protocol_decode_part_to_stream_async_default (ModestAccountProtocol *protocol,
 									     TnyMimePart *self, 
+									     const gchar *stream_uri,
 									     TnyStream *stream, 
 									     TnyMimePartCallback callback, 
 									     TnyStatusCallback status_callback, 
@@ -552,12 +555,16 @@ modest_account_protocol_get_account_settings_dialog (ModestAccountProtocol *self
 	if (dialog == NULL) {
 
 		dialog = MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->create_account_settings_dialog (self);
-	
+
+		/* Check existence of dialog */
+		if (dialog == NULL)
+			return NULL;
+
 		/* Load settings */
-		settings = modest_account_mgr_load_account_settings (modest_runtime_get_account_mgr (), 
+		settings = modest_account_mgr_load_account_settings (modest_runtime_get_account_mgr (),
 								     account_name);
 		modest_account_settings_dialog_load_settings (dialog, settings);
-	
+
 		/* Close dialog on response */
 		g_signal_connect_swapped (dialog,
 					  "response",
@@ -704,8 +711,10 @@ modest_account_protocol_wizard_finished (ModestAccountProtocol *self)
 static gboolean
 modest_account_protocol_decode_part_to_stream_default (ModestAccountProtocol *self,
 						       TnyMimePart *part,
+						       const gchar *stream_uri,
 						       TnyStream *stream,
-						       GError *error)
+						       gssize *written,
+						       GError **error)
 {
 	/* By default account protocols do not handle themselves the transfer */
 	return FALSE;
@@ -714,18 +723,23 @@ modest_account_protocol_decode_part_to_stream_default (ModestAccountProtocol *se
 gboolean
 modest_account_protocol_decode_part_to_stream (ModestAccountProtocol *self,
 					       TnyMimePart *part,
+					       const gchar *stream_uri,
 					       TnyStream *stream,
-					       GError *error)
+					       gssize *written,
+					       GError **error)
 {
 	return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->decode_part_to_stream (self,
 										part,
+										stream_uri,
 										stream,
+										written,
 										error);
 }
 
 static gboolean
 modest_account_protocol_decode_part_to_stream_async_default (ModestAccountProtocol *self,
 							     TnyMimePart *part,
+							     const gchar *stream_uri,
 							     TnyStream *stream, 
 							     TnyMimePartCallback callback, 
 							     TnyStatusCallback status_callback, 
@@ -738,6 +752,7 @@ modest_account_protocol_decode_part_to_stream_async_default (ModestAccountProtoc
 gboolean
 modest_account_protocol_decode_part_to_stream_async (ModestAccountProtocol *self,
 						     TnyMimePart *part, 
+						     const gchar *stream_uri,
 						     TnyStream *stream, 
 						     TnyMimePartCallback callback, 
 						     TnyStatusCallback status_callback, 
@@ -745,6 +760,7 @@ modest_account_protocol_decode_part_to_stream_async (ModestAccountProtocol *self
 {
 	return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->decode_part_to_stream_async (self,
 										      part,
+										      stream_uri,
 										      stream,
 										      callback,
 										      status_callback,