2008-11-19 [colin] 3.6.1cvs35
authorColin Leroy <colin@colino.net>
Wed, 19 Nov 2008 08:11:36 +0000 (08:11 +0000)
committerColin Leroy <colin@colino.net>
Wed, 19 Nov 2008 08:11:36 +0000 (08:11 +0000)
* src/compose.c
* src/prefs_common.c
* src/prefs_common.h
Add primary_paste_unselects hidden preference
to change how middle-click pasting changes
the selection and insert point; defaults to
pre-3.6.1cvs31

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/prefs_common.c
src/prefs_common.h

index 2ed335f883cf8b9e1e9eebc914f0866facc98c52..356be85269d91ca31681aa0cbf9e17815aacaec0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-19 [colin]     3.6.1cvs35
+
+       * src/compose.c
+       * src/prefs_common.c
+       * src/prefs_common.h
+               Add primary_paste_unselects hidden preference
+               to change how middle-click pasting changes
+               the selection and insert point; defaults to
+               pre-3.6.1cvs31
+
 2008-11-19 [colin]     3.6.1cvs34
 
        * src/folderview.c
index d0dc2fc3814a3f5146ba23e577711d57d8582393..fd9679f10d61fa95edec29fe51e5d18c4dbfa6db 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.49.2.119 -r 1.49.2.120 src/procmime.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/w32_reg.c;  ) > 3.6.1cvs32.patchset
 ( cvs diff -u -r 1.39.2.53 -r 1.39.2.54 src/mainwindow.h;  ) > 3.6.1cvs33.patchset
 ( cvs diff -u -r 1.207.2.206 -r 1.207.2.207 src/folderview.c;  ) > 3.6.1cvs34.patchset
+( cvs diff -u -r 1.382.2.484 -r 1.382.2.485 src/compose.c;  cvs diff -u -r 1.204.2.182 -r 1.204.2.183 src/prefs_common.c;  cvs diff -u -r 1.103.2.117 -r 1.103.2.118 src/prefs_common.h;  ) > 3.6.1cvs35.patchset
index f0bf849f6995d11f43b975238754e28b0ff845df..a3ac251c84142f6f688641eb62361ccd8c15adc4 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index fa0eb0cdb53e3040c268734749e9b9595447ea83..60a1b51e1ebc59c79554c6873a7a5e7c2e82e8da 100644 (file)
@@ -9397,7 +9397,8 @@ 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 (prefs_common.primary_paste_unselects)
+                               gtk_text_buffer_select_range(buffer, insert_place, insert_place);
                }
                
                if (!wrap) {
index 99d2de044213ee6a75725b5ed2da33c7b7b39180..9eb5ae6054016ec91e2c7272c5cb00bbb39e5167 100644 (file)
@@ -233,6 +233,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"linewrap_pastes", "TRUE", &prefs_common.linewrap_pastes, P_BOOL,
         NULL, NULL, NULL},
+       {"primary_paste_unselects", "FALSE", &prefs_common.primary_paste_unselects, P_BOOL,
+        NULL, NULL, NULL},
        {"linewrap_auto", "TRUE", &prefs_common.autowrap, P_BOOL,
         NULL, NULL, NULL},
        {"auto_indent", "TRUE", &prefs_common.auto_indent, P_BOOL,
index bf079a3455fd7dc0a2de8b952feb591d332df4a7..4169f979003b4c81a6e2e44ed268cb66ca7d49ce 100644 (file)
@@ -139,6 +139,7 @@ struct _PrefsCommon
        gint linewrap_len;
        gboolean linewrap_quote;
        gboolean linewrap_pastes;
+       gboolean primary_paste_unselects;
        gboolean autowrap;
        gboolean auto_indent;
        gboolean auto_exteditor;