X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-protocol.c;h=850be4edc2d01f212a5b35bae167a244219951e4;hp=ef7d1b7bc816ddc25c52ea524faea252a417fba6;hb=fd067def87340f018ddaa4a10a81ce2d717906d3;hpb=87f15c1e87208d058d1fe715cf149bfdb9acab5e

diff --git a/src/modest-account-protocol.c b/src/modest-account-protocol.c
index ef7d1b7..850be4e 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, 
@@ -130,6 +133,11 @@ static void modest_account_protocol_save_remote_draft_default (ModestAccountProt
 							       TnyMsg *old_msg,
 							       ModestAccountProtocolSaveRemoteDraftCallback callback,
 							       gpointer userdata);
+static gboolean
+modest_account_protocol_handle_calendar_default (ModestAccountProtocol *self,
+						 ModestWindow *window,
+						 TnyMimePart *calendar_part,
+						 GtkContainer *container);
 
 /* globals */
 static GObjectClass *parent_class = NULL;
@@ -239,6 +247,8 @@ modest_account_protocol_class_init (ModestAccountProtocolClass *klass)
 		modest_account_protocol_get_service_icon_default;
 	account_class->save_remote_draft =
 		modest_account_protocol_save_remote_draft_default;
+	account_class->handle_calendar =
+		modest_account_protocol_handle_calendar_default;
 
 }
 
@@ -552,12 +562,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 +718,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 +730,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 +759,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 +767,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,
@@ -887,3 +910,21 @@ modest_account_protocol_save_remote_draft_default (ModestAccountProtocol *self,
 	}
 }
 
+gboolean
+modest_account_protocol_handle_calendar (ModestAccountProtocol *self,
+					 ModestWindow *window,
+					 TnyMimePart *calendar_part,
+					 GtkContainer *container)
+{
+	return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->handle_calendar (self, window, 
+									  calendar_part, container);
+}
+
+static gboolean
+modest_account_protocol_handle_calendar_default (ModestAccountProtocol *self,
+						 ModestWindow *window,
+						 TnyMimePart *calendar_part,
+						 GtkContainer *container)
+{
+	return FALSE;
+}