2008-11-15 [colin] 3.6.1cvs31

	* src/compose.c
		After a mid-click paste, deselect selection
		and go to end of paste.

diff --git a/ChangeLog b/ChangeLog
index 56bdf11d90ae7ebdc81a8264387361343831c081..0364b334099b1c07a61433d4f59175a17725092a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-15 [colin]     3.6.1cvs31
+
+       * src/compose.c
+               After a mid-click paste, deselect selection
+               and go to end of paste.
+
 2008-11-15 [colin]     3.6.1cvs30
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 69090c972537871d232dd473664e1e85477be8c5..3929b3ed8d1092a376d4f0a4dc72383786dda665 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3612,3 +3612,4 @@
 ( cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/prefs_actions.c;  ) > 3.6.1cvs28.patchset
 ( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs29.patchset
 ( cvs diff -u -r 1.382.2.482 -r 1.382.2.483 src/compose.c;  ) > 3.6.1cvs30.patchset
+( cvs diff -u -r 1.382.2.483 -r 1.382.2.484 src/compose.c;  ) > 3.6.1cvs31.patchset

diff --git a/configure.ac b/configure.ac
index dbbc7fcf3995aa2c9cd77e493cce0097dd04f7d3..92beedcb022b369bfd85b65ec7b5a1395ed0e31c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 16468a0b4c0b7a148a8b48322d377fc21d9f735b..fa0eb0cdb53e3040c268734749e9b9595447ea83 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -9397,6 +9397,7 @@ static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
                         * used for mid-click-pasting */
                        start = gtk_text_iter_get_offset(insert_place);
                        gtk_text_buffer_insert(buffer, insert_place, contents, strlen(contents));
+                       gtk_text_buffer_select_range(buffer, insert_place, insert_place);
                }
                
                if (!wrap) {