2010-11-25 [paul] 3.7.7cvs6

	* src/prefs_common.c
		make "gtk_can_change_accels" FALSE by default.
		fixes bug #2309, 'Shortcuts should not be modifiable
		by default' (RFE)

diff --git a/ChangeLog b/ChangeLog
index 97c6f7b8a5695fb4ec3e0b01f1cc19809ee51ddb..8eccbe8628ee3a0a7e70fdffbe140d254e44eb04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-25 [paul]      3.7.7cvs6
+
+       * src/prefs_common.c
+               make "gtk_can_change_accels" FALSE by default.
+               fixes bug #2309, 'Shortcuts should not be modifiable
+               by default' (RFE)
+

 2010-11-24 [mones]     3.7.7cvs5
 
        * src/mainwindow.c
 2010-11-24 [mones]     3.7.7cvs5
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index bc5b15bb047a0d8a0d64af159b97c393f720c0a9..edf7241f32042915ab22fa9fe370994163e629b8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4067,3 +4067,4 @@
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/claws.def;  ) > 3.7.7cvs3.patchset
 ( cvs diff -u -r 1.382.2.560 -r 1.382.2.561 src/compose.c;  ) > 3.7.7cvs4.patchset
 ( cvs diff -u -r 1.274.2.318 -r 1.274.2.319 src/mainwindow.c;  ) > 3.7.7cvs5.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/claws.def;  ) > 3.7.7cvs3.patchset
 ( cvs diff -u -r 1.382.2.560 -r 1.382.2.561 src/compose.c;  ) > 3.7.7cvs4.patchset
 ( cvs diff -u -r 1.274.2.318 -r 1.274.2.319 src/mainwindow.c;  ) > 3.7.7cvs5.patchset

+( cvs diff -u -r 1.204.2.197 -r 1.204.2.198 src/prefs_common.c;  ) > 3.7.7cvs6.patchset

diff --git a/configure.ac b/configure.ac
index c5af6784429ffb0a064589212d90df09b53c6db6..56c533f4b1bf640bc824072a5202b8a05c2efc83 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=5
+EXTRA_VERSION=6

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 24c3429781392c3ea5b90b51148df18d976698fe..fcb9a9b418862634af4e477ef227f558737648bb 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -924,7 +924,7 @@ static PrefParam param[] = {
        {"filtering_debug_log_length", "500", &prefs_common.filtering_debug_loglength, P_INT,
         NULL, NULL, NULL},
 
        {"filtering_debug_log_length", "500", &prefs_common.filtering_debug_loglength, P_INT,
         NULL, NULL, NULL},
 

-       {"gtk_can_change_accels", "TRUE", &prefs_common.gtk_can_change_accels, P_BOOL,
+       {"gtk_can_change_accels", "FALSE", &prefs_common.gtk_can_change_accels, P_BOOL,

         NULL, NULL, NULL},
 
        {"color_new", "#0000b3", &prefs_common.color_new, P_COLOR,
         NULL, NULL, NULL},
 
        {"color_new", "#0000b3", &prefs_common.color_new, P_COLOR,