talons

commit 24d33c01f43851f399df335a97f6a22aba5a2522
parent 8568b5f8318d1028616717f877b517ebd8cd4aa0
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 19 Nov 2008 08:11:36 +0000

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

Diffstat:
M
ChangeLog
 | 
10
++++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
3
++-
M
src/prefs_common.c
 | 
2
++
M
src/prefs_common.h
 | 
1
+

6 files changed, 17 insertions(+), 2 deletions(-)
diff --git 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
diff --git a/PATCHSETS b/PATCHSETS
@@ -3616,3 +3616,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git a/src/compose.c b/src/compose.c
@@ -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) {
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -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,
diff --git a/src/prefs_common.h b/src/prefs_common.h
@@ -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;