Fixes a crash when saving attachments fails

[modest] / src / modest-account-protocol.c

diff --git a/src/modest-account-protocol.c b/src/modest-account-protocol.c
index bc1e00f..850be4e 100644 (file)
--- a/src/modest-account-protocol.c
+++ b/src/modest-account-protocol.c
@@ -93,11 +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,
                                                                       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, 
@@ -131,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;
@@ -240,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;
 
 }
 
@@ -553,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",
@@ -705,6 +718,7 @@ 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,
                                                       gssize *written,
                                                       GError **error)
@@ -716,12 +730,14 @@ 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,
                                               gssize *written,
                                               GError **error)
 {
        return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->decode_part_to_stream (self,
                                                                                part,
+                                                                               stream_uri,
                                                                                stream,
                                                                                written,
                                                                                error);
@@ -730,6 +746,7 @@ modest_account_protocol_decode_part_to_stream (ModestAccountProtocol *self,
 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, 
@@ -742,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, 
@@ -749,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,
@@ -891,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;
+}