X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=b8821bad164e3f00e524c56baa3c3ee771265067;hp=74b444937e054132d4f48287278ca3e0a4698f53;hb=fe00a2008384d890a2f59d4ca54adc2c29751505;hpb=5fd0d22df03991b82ef86f83d221e1be9c60aab8

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 74b4449..b8821ba 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -982,7 +982,7 @@ pixbuf_from_stream (TnyStream *stream,
 	GdkPixbuf *pixbuf;
 	guint64 size;
 	GError *error = NULL;
-	
+
 	size = 0;
 
 	loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
@@ -1046,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)) {
@@ -1070,6 +1071,7 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
 		g_object_unref (part);
 	}
 	g_object_unref (iter);
+	g_object_unref (self);
 }
 
 static void
@@ -1080,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")) {
@@ -2128,6 +2130,7 @@ 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 ();
@@ -2174,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;
@@ -2198,7 +2201,8 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 				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);
@@ -2214,8 +2218,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 
 		}
 	}
-
-
+	g_object_unref (window);
 }
 
 static void
@@ -2349,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
@@ -2361,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;
 		}