X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=503739cf589353ade5a398417ab1d8dbca67dcc6;hp=da23b5d5bb5a103d94c9bfad2d091e247e26e60a;hb=ae6cc4558ea0f5afc82a06376200904ee7b061dd;hpb=f1dd26f4a1024e2d10f373fb5b5f8655ebad0fdf

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index da23b5d..503739c 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -1082,6 +1082,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
 	while (cursor) {
 		if (!(TNY_IS_MIME_PART(cursor->data))) {
 			g_warning ("strange data in attachment list");
+			cursor = g_list_next (cursor);
 			continue;
 		}
 		data->attachments = g_list_append (data->attachments,
@@ -2665,6 +2666,9 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
 
 	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 	parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+	if (!GTK_WIDGET_VISIBLE (window))
+		return;
 	has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL);
 	focused = gtk_window_get_focus (GTK_WINDOW (window));