2006-08-04 [colin] 2.4.0cvs27

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 4efc05b893092814085d025e57e6580a4366d18e..63b2efe2f4a3fea1e6ded496a8eadb54a0f2ee25 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -7934,16 +7934,18 @@ static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
                GtkTextMark *mark_start = gtk_text_buffer_get_insert(buffer);
                GtkTextIter start_iter, end_iter;
                gint start, end;
-               
                gchar *contents = gtk_clipboard_wait_for_text(gtk_clipboard_get(clip));
 
                if (contents == NULL)
                        return;
 
+               undo_paste_clipboard(compose->text, compose->undostruct);
+
                /* we shouldn't delete the selection when middle-click-pasting, or we
                 * can't mid-click-paste our own selection */
-               if (clip != GDK_SELECTION_PRIMARY)
+               if (clip != GDK_SELECTION_PRIMARY) {
                        gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
+               }
                
                if (insert_place == NULL) {
                        /* if insert_place isn't specified, insert at the cursor.
@@ -7971,7 +7973,6 @@ static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
                        gtk_text_iter_backward_char(&start_iter);
                        compose_beautify_paragraph(compose, &start_iter, TRUE);
                }
-               
        } else if (GTK_IS_EDITABLE(entry))
                gtk_editable_paste_clipboard (GTK_EDITABLE(entry));