X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-protocol.c;h=850be4edc2d01f212a5b35bae167a244219951e4;hb=12138940aec8759ae14b361b50ffdd66a71f0721;hp=4c028a1eee9e0d668b885118da598fdc4ceea2e6;hpb=4bff54e275785cc7e7f2edd32ac17f8771d104ac;p=modest

diff --git a/src/modest-account-protocol.c b/src/modest-account-protocol.c
index 4c028a1..850be4e 100644
--- a/src/modest-account-protocol.c
+++ b/src/modest-account-protocol.c
@@ -93,8 +93,17 @@ 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, 
+									     gpointer user_data);
 static gboolean modest_account_protocol_is_supported_default (ModestAccountProtocol *self);
 static gchar *modest_account_protocol_get_from_default (ModestAccountProtocol *self,
 							const gchar *account_id,
@@ -124,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;
@@ -217,6 +231,8 @@ modest_account_protocol_class_init (ModestAccountProtocolClass *klass)
 		modest_account_protocol_wizard_finished_default;
 	account_class->decode_part_to_stream =
 		modest_account_protocol_decode_part_to_stream_default;
+	account_class->decode_part_to_stream_async =
+		modest_account_protocol_decode_part_to_stream_async_default;
 	account_class->get_from =
 		modest_account_protocol_get_from_default;
 	account_class->get_from_list =
@@ -231,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;
 
 }
 
@@ -544,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",
@@ -696,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;
@@ -706,15 +730,50 @@ 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, 
+							     gpointer user_data)
+{
+	/* By default account protocols do not handle themselves the transfer */
+	return FALSE;
+}
+
+gboolean
+modest_account_protocol_decode_part_to_stream_async (ModestAccountProtocol *self,
+						     TnyMimePart *part, 
+						     const gchar *stream_uri,
+						     TnyStream *stream, 
+						     TnyMimePartCallback callback, 
+						     TnyStatusCallback status_callback, 
+						     gpointer user_data)
+{
+	return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->decode_part_to_stream_async (self,
+										      part,
+										      stream_uri,
+										      stream,
+										      callback,
+										      status_callback,
+										      user_data);
+}
+
 gchar *
 modest_account_protocol_get_from (ModestAccountProtocol *self,
 				  const gchar *account_id,
@@ -851,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;
+}