2008-11-07 [colin] 3.6.1cvs20

	* src/mainwindow.c
	* src/summaryview.c
		Fix crash when rebuilding colorlabel
		menu
	* src/addrgather.c
	* src/editldap.c
	* src/prefs_account.c
	* src/prefs_compose_writing.c
	* src/prefs_logging.c
	* src/prefs_message.c
	* src/prefs_other.c
	* src/prefs_receive.c
	* src/prefs_summaries.c
	* src/prefs_wrapping.c
	* src/plugins/bogofilter/bogofilter_gtk.c
	* src/plugins/pgpcore/prefs_gpg.c
	* src/plugins/spamassassin/spamassassin_gtk.c
		Fix deprecated use of page_size in
		gtkspinbutton adjustments

diff --git a/ChangeLog b/ChangeLog
index 397e322d53e5f069c20f6112c120d0bb13df4379..0e0c48ad19aeadfd87b9a5eddff73a186d8c76e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2008-11-07 [colin]     3.6.1cvs20
+
+       * src/mainwindow.c
+       * src/summaryview.c
+               Fix crash when rebuilding colorlabel
+               menu
+       * src/addrgather.c
+       * src/editldap.c
+       * src/prefs_account.c
+       * src/prefs_compose_writing.c
+       * src/prefs_logging.c
+       * src/prefs_message.c
+       * src/prefs_other.c
+       * src/prefs_receive.c
+       * src/prefs_summaries.c
+       * src/prefs_wrapping.c
+       * src/plugins/bogofilter/bogofilter_gtk.c
+       * src/plugins/pgpcore/prefs_gpg.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               Fix deprecated use of page_size in 
+               gtkspinbutton adjustments
+
 2008-11-06 [mones]     3.6.1cvs19
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index ebfa3e54b58a2e7dd398dccbda3f8d746a525e81..cd2ea04264a47994a1a20085ca76b23894e41f5a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3601,3 +3601,4 @@
 ( cvs diff -u -r 1.274.2.286 -r 1.274.2.287 src/mainwindow.c;  ) > 3.6.1cvs17.patchset
 ( cvs diff -u -r 1.12.2.54 -r 1.12.2.55 src/action.c;  cvs diff -u -r 1.115.2.214 -r 1.115.2.215 src/main.c;  cvs diff -u -r 1.274.2.287 -r 1.274.2.288 src/mainwindow.c;  cvs diff -u -r 1.13.2.40 -r 1.13.2.41 src/common/socket.c;  cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/common/socket.h;  cvs diff -u -r 1.5.2.84 -r 1.5.2.85 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.46 -r 1.4.2.47 src/gtk/gtkutils.h;  ) > 3.6.1cvs18.patchset
 ( cvs diff -u -r 1.274.2.288 -r 1.274.2.289 src/mainwindow.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 tools/claws.i18n.status.pl;  ) > 3.6.1cvs19.patchset
+( cvs diff -u -r 1.5.10.26 -r 1.5.10.27 src/addrgather.c;  cvs diff -u -r 1.8.2.32 -r 1.8.2.33 src/editldap.c;  cvs diff -u -r 1.274.2.289 -r 1.274.2.290 src/mainwindow.c;  cvs diff -u -r 1.105.2.147 -r 1.105.2.148 src/prefs_account.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_logging.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/prefs_message.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_other.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_receive.c;  cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_wrapping.c;  cvs diff -u -r 1.395.2.397 -r 1.395.2.398 src/summaryview.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.23.2.51 -r 1.23.2.52 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.6.1cvs20.patchset

diff --git a/configure.ac b/configure.ac
index f19ad64508e48a472c5e22a27f8d758087a70a27..edb4b5924366de87bf3707ce24f918287d63fea2 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=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrgather.c b/src/addrgather.c
index 92207d920ab66395baa909930bd4bbffd02feab5..032bbce9100230dff45ac6831aa91f8c4ecf0941 100644 (file)
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -315,7 +315,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl)
                        _("Maximum amount of entries per folder within the newly created address book"));
 
        hboxs = gtk_hbox_new(FALSE, 8);
-       adjFolder = gtk_adjustment_new(DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 100);
+       adjFolder = gtk_adjustment_new(DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 0);
        spinbtnFolder = gtk_spin_button_new(GTK_ADJUSTMENT(adjFolder), 1, 0);
        gtk_box_pack_start(GTK_BOX(hboxs), spinbtnFolder, FALSE, FALSE, 0);
        gtk_widget_set_size_request(spinbtnFolder, 100, -1);

diff --git a/src/editldap.c b/src/editldap.c
index 5c562bdac03f4401078b08e6428c725c2ce82125..1d65e5606e56f3ef2ca1778cd7c76ec1e844874b 100644 (file)
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -461,7 +461,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
        hbox_spin = gtk_hbox_new (FALSE, 8);
-       spinbtn_port_adj = gtk_adjustment_new (389, 1, 65535, 1, 1000, 1000);
+       spinbtn_port_adj = gtk_adjustment_new (389, 1, 65535, 1, 1000, 0);
        spinbtn_port = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_port_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_port, TRUE, FALSE, 0);
        gtk_widget_set_size_request (spinbtn_port, 64, -1);
@@ -605,7 +605,7 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
 
        hbox_spin = gtk_hbox_new (FALSE, 8);
        spinbtn_queryage_adj = gtk_adjustment_new(
-               LDAPCTL_DFL_QUERY_AGE, 1, LDAPCTL_MAX_QUERY_AGE, 10, 1000, 1000 );
+               LDAPCTL_DFL_QUERY_AGE, 1, LDAPCTL_MAX_QUERY_AGE, 10, 1000, 0 );
        spinbtn_queryage = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_queryage_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_queryage, FALSE, FALSE, 0);
        gtk_widget_set_size_request (spinbtn_queryage, 64, -1);
@@ -741,7 +741,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
        hbox_spin = gtk_hbox_new (FALSE, 8);
-       spinbtn_timeout_adj = gtk_adjustment_new (0, 0, 300, 1, 10, 10);
+       spinbtn_timeout_adj = gtk_adjustment_new (0, 0, 300, 1, 10, 0);
        spinbtn_timeout = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_timeout_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_timeout, FALSE, FALSE, 0);
        gtk_widget_set_size_request (spinbtn_timeout, 64, -1);
@@ -759,7 +759,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
        hbox_spin = gtk_hbox_new (FALSE, 8);
-       spinbtn_maxentry_adj = gtk_adjustment_new (0, 0, 500, 1, 10, 10);
+       spinbtn_maxentry_adj = gtk_adjustment_new (0, 0, 500, 1, 10, 0);
        spinbtn_maxentry = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_maxentry_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_maxentry, FALSE, FALSE, 0);
        gtk_widget_set_size_request (spinbtn_maxentry, 64, -1);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 68dc0075a9b911aebe48a5d7776a4e72205afe7c..3b857a4564ed60fcadf1954ef26a172cc3a2acfd 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2449,6 +2449,10 @@ void main_window_reflect_prefs_custom_colors(MainWindow *mainwin)
 
        /* clear items. get item pointers. */
        for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+               g_signal_handlers_disconnect_matched
+                        (gtk_ui_manager_get_accel_group(mainwin->ui_manager), 
+                        G_SIGNAL_MATCH_DATA|G_SIGNAL_MATCH_FUNC,
+                        0, 0, NULL, mainwin_accel_changed_cb, cur->data);
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
        }
        mainwindow_colorlabel_menu_create(mainwin, TRUE);

diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index 6243718597e0b598b756349f001e9d2a40eaaa27..ac5e75b4f9c2305d061af6d3db6bb14fb793a0b4 100644 (file)
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -157,7 +157,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
        gtk_widget_show(max_size_label);
        gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_label, FALSE, FALSE, 0);
 
-       max_size_spinbtn_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 10);
+       max_size_spinbtn_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 0);
        max_size_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_spinbtn_adj), 1, 0);
        gtk_widget_show(max_size_spinbtn);
        gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_spinbtn, FALSE, FALSE, 0);

diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index db5e1c2746b99fcf6a245290b1df1d948f457205..371f01f563e940f65c786299bd1fd7d31564c198 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -124,7 +124,7 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
        gtk_box_pack_start (GTK_BOX (hbox1), label_expire1, FALSE, FALSE, 0);
 
        spinbtn_store_passphrase_adj =
-           gtk_adjustment_new(1, 0, 1440, 1, 10, 10);
+           gtk_adjustment_new(1, 0, 1440, 1, 10, 0);
        spinbtn_store_passphrase =
            gtk_spin_button_new(GTK_ADJUSTMENT
                                (spinbtn_store_passphrase_adj), 1, 0);

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 6b57fd9c9338bfc7b22e40c331bdce6034801089..5882c318452f5e723d2edeb426d60dfc23556244 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -336,7 +336,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(spamd_colon_label);
        gtk_box_pack_start(GTK_BOX(hbox_spamd), spamd_colon_label, FALSE, FALSE, 0);
 
-       spamd_port_spinbtn_adj = gtk_adjustment_new(783, 1, 65535, 1, 10, 10);
+       spamd_port_spinbtn_adj = gtk_adjustment_new(783, 1, 65535, 1, 10, 0);
        spamd_port_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(spamd_port_spinbtn_adj), 1, 0);
        gtk_widget_show(spamd_port_spinbtn);
        gtk_box_pack_start(GTK_BOX(hbox_spamd), spamd_port_spinbtn, FALSE, FALSE, 0);
@@ -357,7 +357,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(max_size_label);
        gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_label, FALSE, FALSE, 0);
 
-       max_size_spinbtn_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 10);
+       max_size_spinbtn_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 0);
        max_size_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_spinbtn_adj), 1, 0);
        gtk_widget_show(max_size_spinbtn);
        gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_spinbtn, FALSE, FALSE, 0);
@@ -377,7 +377,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(timeout_label);
        gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_label, FALSE, FALSE, 0);
 
-       timeout_spinbtn_adj = gtk_adjustment_new(60, 0, 10000, 10, 10, 10);
+       timeout_spinbtn_adj = gtk_adjustment_new(60, 0, 10000, 10, 10, 0);
        timeout_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(timeout_spinbtn_adj), 1, 0);
        gtk_widget_show(timeout_spinbtn);
        gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_spinbtn, FALSE, FALSE, 0);

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 4d568726706ddfc853d66c4e37ca5a81b15859bf..73efe838cb315e93c02bf6c9862d819d346a254f 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1504,7 +1504,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
 
        maxarticle_spinbtn_adj =
-               gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
+               gtk_adjustment_new (300, 0, 10000, 10, 100, 0);
        maxarticle_spinbtn = gtk_spin_button_new
                (GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
        gtk_widget_show (maxarticle_spinbtn);

diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index 0d9464c33591c65cd44bba656a8974b54c035ab2..5b57076e59662eccb43d69e020ce5179fb9e642c 100644 (file)
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -144,7 +144,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
        PACK_CHECK_BUTTON (hbox_autosave, checkbtn_autosave,
                           _("Autosave message text to Drafts folder every"));
 
-       spinbtn_autosave_adj = gtk_adjustment_new (50, 0, 1000, 1, 10, 10);
+       spinbtn_autosave_adj = gtk_adjustment_new (50, 0, 1000, 1, 10, 0);
        spinbtn_autosave_length = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_autosave_adj), 1, 0);
        gtk_widget_set_size_request (spinbtn_autosave_length, 64, -1);  
@@ -164,7 +164,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
        gtk_widget_show (label_undolevel);
        gtk_box_pack_start (GTK_BOX (hbox_undolevel), label_undolevel, FALSE, FALSE, 0);
 
-       spinbtn_undolevel_adj = gtk_adjustment_new (50, 0, 100, 1, 10, 10);
+       spinbtn_undolevel_adj = gtk_adjustment_new (50, 0, 100, 1, 10, 0);
        spinbtn_undolevel = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_undolevel_adj), 1, 0);
        gtk_widget_show (spinbtn_undolevel);

diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index 7f50d2a43cae5b388759253c628bd228fa42a6df..991928ad5e22c5c3614f6ad224692a1f37364d33 100644 (file)
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -146,7 +146,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON (hbox_clip_network_log, checkbtn_clip_network_log,
                           _("Restrict the log window to"));
        
-       spinbtn_network_log_length_adj = gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 10);
+       spinbtn_network_log_length_adj = gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0);
        spinbtn_network_log_length = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_network_log_length_adj), 1, 0);
        gtk_widget_show (spinbtn_network_log_length);
@@ -253,7 +253,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON (hbox_clip_filtering_log, checkbtn_clip_filtering_log,
                           _("Restrict the log window to"));
        
-       spinbtn_filtering_log_length_adj = gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 10);
+       spinbtn_filtering_log_length_adj = gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0);
        spinbtn_filtering_log_length = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_filtering_log_length_adj), 1, 0);
        gtk_widget_show (spinbtn_filtering_log_length);

diff --git a/src/prefs_message.c b/src/prefs_message.c
index a2801b932fb9dc10fc377609e0a2679e9fca6063..82a3638d9e9e1897b11a7655b3a113d3abd5decd 100644 (file)
--- a/src/prefs_message.c
+++ b/src/prefs_message.c
@@ -156,7 +156,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
 
        hbox1 = gtk_hbox_new (FALSE, 32);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
 
        hbox_linespc = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -167,7 +167,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start (GTK_BOX (hbox_linespc), label_linespc,
                            FALSE, FALSE, 0);
 
-       spinbtn_linespc_adj = gtk_adjustment_new (2, 0, 16, 1, 1, 16);
+       spinbtn_linespc_adj = gtk_adjustment_new (2, 0, 16, 1, 1, 0);
        spinbtn_linespc = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_linespc_adj), 1, 0);
        gtk_widget_show (spinbtn_linespc);
@@ -180,6 +180,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_linespc);
        gtk_box_pack_start (GTK_BOX (hbox_linespc), label_linespc,
                            FALSE, FALSE, 0);
+       gtk_widget_show_all (hbox1);
 
        vbox_scr = gtkut_get_options_frame(vbox1, &frame, _("Scroll"));
 
@@ -199,7 +200,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_scr);
        gtk_box_pack_start (GTK_BOX (hbox_scr), label_scr, FALSE, FALSE, 0);
 
-       spinbtn_scrollstep_adj = gtk_adjustment_new (1, 1, 100, 1, 10, 10);
+       spinbtn_scrollstep_adj = gtk_adjustment_new (1, 1, 100, 1, 10, 0);
        spinbtn_scrollstep = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_scrollstep_adj), 1, 0);
        gtk_widget_show (spinbtn_scrollstep);

diff --git a/src/prefs_other.c b/src/prefs_other.c
index ced063934b2c7c0b7855e0ea32b458cba62f78db..775686319cef92c6e2ff764eb2b7bb9ec746fa00 100644 (file)
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -511,7 +511,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 
-       spinbtn_iotimeout_adj = gtk_adjustment_new (60, 0, 1000, 1, 10, 10);
+       spinbtn_iotimeout_adj = gtk_adjustment_new (60, 0, 1000, 1, 10, 0);
        spinbtn_iotimeout = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_iotimeout_adj), 1, 0);
        gtk_widget_show (spinbtn_iotimeout);

diff --git a/src/prefs_receive.c b/src/prefs_receive.c
index ea214fef8d60344d9f9001b3729e13d8c154c6ec..b466a0f9085e85c74209e8ebd9310169bab3089f 100644 (file)
--- a/src/prefs_receive.c
+++ b/src/prefs_receive.c
@@ -161,7 +161,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk,
                           _("Automatically check for new mail every"));
 
-       spinbtn_autochk_adj = gtk_adjustment_new (5, 1, 100, 1, 10, 10);
+       spinbtn_autochk_adj = gtk_adjustment_new (5, 1, 100, 1, 10, 0);
        spinbtn_autochk = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_autochk_adj), 1, 0);
        gtk_widget_show (spinbtn_autochk);

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 7d62afb5d751f1972fcdbd9ee655df920bcc8bb3..0bb04e4d7849e9919cdd865520cc6919dec3a1b3 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -385,7 +385,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_ng_abbrev);
        gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
 
-       spinbtn_ng_abbrev_len_adj = gtk_adjustment_new (16, 0, 999, 1, 10, 10);
+       spinbtn_ng_abbrev_len_adj = gtk_adjustment_new (16, 0, 999, 1, 10, 0);
        spinbtn_ng_abbrev_len = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_ng_abbrev_len_adj), 1, 0);
        gtk_widget_show (spinbtn_ng_abbrev_len);
@@ -484,7 +484,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_box_pack_start (GTK_BOX (hbox1), radio_mark_as_read_on_select, FALSE, FALSE, 0);
 
-       spinbtn_mark_as_read_delay_adj = gtk_adjustment_new (0, 0, 60, 1, 10, 10);
+       spinbtn_mark_as_read_delay_adj = gtk_adjustment_new (0, 0, 60, 1, 10, 0);
        spinbtn_mark_as_read_delay = gtk_spin_button_new
                        (GTK_ADJUSTMENT (spinbtn_mark_as_read_delay_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_mark_as_read_delay,

diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c
index e0e18535708deec4134d9c680be7b6bdb0a46e33..0d355b5047a19ea8084bb0a383fa4d02d257add4 100644 (file)
--- a/src/prefs_wrapping.c
+++ b/src/prefs_wrapping.c
@@ -89,7 +89,7 @@ static void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_linewrap);
        gtk_box_pack_start (GTK_BOX (hbox1), label_linewrap, FALSE, FALSE, 4);
 
-       spinbtn_linewrap_adj = gtk_adjustment_new (72, 20, 1024, 1, 10, 10);
+       spinbtn_linewrap_adj = gtk_adjustment_new (72, 20, 1024, 1, 10, 0);
        spinbtn_linewrap = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_linewrap_adj), 1, 0);
        gtk_widget_set_size_request (spinbtn_linewrap, 64, -1);

diff --git a/src/summaryview.c b/src/summaryview.c
index 9d51b97f88f372a8a6efd316d178ce2cc10086cc..6ea31d309de9978291e86c15d0c3ed7fb7c84d19 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -7625,6 +7625,10 @@ void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
 
        /* clear items. get item pointers. */
        for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+               g_signal_handlers_disconnect_matched
+                        (gtk_ui_manager_get_accel_group(summaryview->mainwin->ui_manager), 
+                        G_SIGNAL_MATCH_DATA|G_SIGNAL_MATCH_FUNC,
+                        0, 0, NULL, mainwin_accel_changed_cb, cur->data);
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
        }
        summary_colorlabel_menu_create(summaryview, TRUE);