Fixes leak 7/26

[modest] / src / hildon2 / modest-msg-edit-window.c

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 7fdce14..b8821ba 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -973,12 +973,16 @@ modest_msg_edit_window_finalize (GObject *obj)
 }
 
 static GdkPixbuf *
-pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_size)
+pixbuf_from_stream (TnyStream *stream,
+                   const gchar *mime_type,
+                   guint64 *stream_size,
+                   ModestMsgEditWindow *self)
 {
        GdkPixbufLoader *loader;
        GdkPixbuf *pixbuf;
        guint64 size;
-       
+       GError *error = NULL;
+
        size = 0;
 
        loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
@@ -989,24 +993,30 @@ pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_s
                return NULL;
        }
 
+       hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
+
        tny_stream_reset (TNY_STREAM (stream));
        while (!tny_stream_is_eos (TNY_STREAM (stream))) {
-               GError *error = NULL;
                unsigned char read_buffer[128];
                gint readed;
                readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128);
                size += readed;
                if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, &error)) {
-                       if (error)
-                               g_error_free (error);
                        break;
                }
+               /* Allow some UI responsiveness */
+               while (gtk_events_pending ())
+                       gtk_main_iteration ();
        }
+       hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), FALSE);
+
+       gdk_pixbuf_loader_close (loader, &error);
 
+       if (error)
+               g_error_free (error);
        pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
        if (pixbuf) 
                g_object_ref (pixbuf);
-       gdk_pixbuf_loader_close (loader, NULL);
        g_object_unref (loader);
 
        if (!pixbuf)
@@ -1036,6 +1046,7 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
+       g_object_ref (self);
        for (iter = tny_list_create_iterator (attachments);
             !tny_iterator_is_done (iter);
             tny_iterator_next (iter)) {
@@ -1045,7 +1056,7 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
                if ((cid != NULL)&&(mime_type != NULL)) {
                        guint64 stream_size;
                        TnyStream *stream = tny_mime_part_get_decoded_stream (part);
-                       GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
+                       GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size, self);
 
 
                        g_object_unref (stream);
@@ -1060,6 +1071,7 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
                g_object_unref (part);
        }
        g_object_unref (iter);
+       g_object_unref (self);
 }
 
 static void
@@ -1070,7 +1082,7 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
        content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
-       
+
        if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
                parent = g_object_ref (msg);
        } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) {
@@ -2096,9 +2108,9 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
        gint response = 0;
        GSList *uris = NULL;
        GSList *uri_node = NULL;
-       
+
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       
+
        dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
        gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ia_select_inline_image_title"));
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
@@ -2118,6 +2130,11 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
        }
        gtk_widget_destroy (dialog);
 
+       g_object_ref (window);
+       /* The operation could take some time so allow the dialog to be closed */
+       while (gtk_events_pending ())
+               gtk_main_iteration ();
+
        for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
                const gchar *uri;
                GnomeVFSHandle *handle = NULL;
@@ -2160,7 +2177,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 
                                modest_platform_information_banner (NULL, NULL, 
                                                                    _FM("sfil_ib_opening_not_allowed"));
-
+                               g_free (filename);
                                g_object_unref (mime_part);
                                gnome_vfs_file_info_unref (info);
                                continue;
@@ -2177,27 +2194,31 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
                        tny_mime_part_set_filename (mime_part, basename);
                        g_free (basename);
 
-                       pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
+                       pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size, window);
 
                        if (pixbuf != NULL) {
                                priv->images_size += stream_size;
                                priv->images_count ++;
                                insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
                                gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark);
-                               wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
+                               wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, 
+                                                            tny_mime_part_get_content_id (mime_part), pixbuf);
                                g_object_unref (pixbuf);
-                       } 
 
-                       tny_list_prepend (priv->images, (GObject *) mime_part);
-                       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+                               tny_list_prepend (priv->images, (GObject *) mime_part);
+                               gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+                       } else {
+                               modest_platform_information_banner (NULL, NULL,
+                                                                   _("mail_ib_file_operation_failed"));
+                       }
+
                        g_free (filename);
                        g_object_unref (mime_part);
                        gnome_vfs_file_info_unref (info);
 
                }
        }
-
-
+       g_object_unref (window);
 }
 
 static void
@@ -2331,6 +2352,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                        if (size > allowed_size) {
                                modest_platform_information_banner (NULL, NULL, 
                                                                    _FM("sfil_ib_opening_not_allowed"));
+                               g_free (filename);
                                return 0;
                        }
                } else
@@ -2343,6 +2365,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                        modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed"));
 
                        g_object_unref (mime_part);
+                       g_free (filename);
                        gnome_vfs_file_info_unref (info);
                        return 0;
                }