From 994ed792cea71b6a710b5d9948affa63cc674b00 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Thu, 30 Sep 2010 07:27:03 +0000 Subject: [PATCH] 2010-09-30 [wwp] 3.7.6cvs42 * src/prefs_account.c * src/prefs_filtering_action.c * src/prefs_matcher.c Fix bug #2274, wrong color label index range used w/ gtk_cmoption_menu (behaviour change has been introduced w/ 3.5.0cvs49 apparently), now it must be 1..N so let's use colorlabel value (0..N) + 1. --- ChangeLog | 12 ++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_account.c | 2 +- src/prefs_filtering_action.c | 2 +- src/prefs_matcher.c | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7fbc4b32..d53e98f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2010-09-30 [wwp] 3.7.6cvs42 + + * src/prefs_account.c + * src/prefs_filtering_action.c + * src/prefs_matcher.c + Fix bug #2274, wrong color label index range + used w/ gtk_cmoption_menu (behaviour change + has been introduced w/ 3.5.0cvs49 apparently), + now it must be 1..N so let's use colorlabel value + (0..N) + 1. + + 2010-09-20 [pawel] 3.7.6cvs41 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 544e0bbef..b7e8ec581 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4037,3 +4037,4 @@ ( cvs diff -u -r 1.382.2.557 -r 1.382.2.558 src/compose.c; ) > 3.7.6cvs39.patchset ( cvs diff -u -r 1.382.2.558 -r 1.382.2.559 src/compose.c; cvs diff -u -r 1.274.2.315 -r 1.274.2.316 src/mainwindow.c; cvs diff -u -r 1.395.2.422 -r 1.395.2.423 src/summaryview.c; ) > 3.7.6cvs40.patchset ( cvs diff -u -r 1.382.2.559 -r 1.382.2.560 src/compose.c; cvs diff -u -r 1.274.2.316 -r 1.274.2.317 src/mainwindow.c; cvs diff -u -r 1.395.2.423 -r 1.395.2.424 src/summaryview.c; ) > 3.7.6cvs41.patchset +( cvs diff -u -r 1.105.2.160 -r 1.105.2.161 src/prefs_account.c; cvs diff -u -r 1.1.4.63 -r 1.1.4.64 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.84 -r 1.43.2.85 src/prefs_matcher.c; ) > 3.7.6cvs42.patchset diff --git a/configure.ac b/configure.ac index 4511b7769..818426e4b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=41 +EXTRA_VERSION=42 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_account.c b/src/prefs_account.c index de966f85e..db7ff301a 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -3703,7 +3703,7 @@ static void prefs_account_crosspost_set_colormenu(PrefParam *pparam) GtkWidget *menu; GtkWidget *menuitem; - gtk_cmoption_menu_set_history(colormenu, colorlabel); + gtk_cmoption_menu_set_history(colormenu, colorlabel + 1); menu = gtk_cmoption_menu_get_menu(colormenu); menuitem = gtk_menu_get_active(GTK_MENU(menu)); gtk_menu_item_activate(GTK_MENU_ITEM(menuitem)); diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c index 2c7f66508..15418a4e2 100644 --- a/src/prefs_filtering_action.c +++ b/src/prefs_filtering_action.c @@ -1572,7 +1572,7 @@ static gboolean prefs_filtering_actions_selected combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo), ACTION_COLOR); gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(filtering_action.color_optmenu), - action->labelcolor); + action->labelcolor + 1); menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU( filtering_action.color_optmenu)); g_signal_emit_by_name(G_OBJECT(menu), "selection-done", menu); diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c index 4cfc74ff5..cac1b2a82 100644 --- a/src/prefs_matcher.c +++ b/src/prefs_matcher.c @@ -2446,7 +2446,7 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector, case MATCHCRITERIA_NOT_COLORLABEL: case MATCHCRITERIA_COLORLABEL: gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu), - prop->value); + prop->value + 1); menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(matcher.color_optmenu)); g_signal_emit_by_name(G_OBJECT(menu), "selection-done", menu); break; -- 2.25.1