2010-09-30 [wwp] 3.7.6cvs42
authorTristan Chabredier <wwp@claws-mail.org>
Thu, 30 Sep 2010 07:27:03 +0000 (07:27 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Thu, 30 Sep 2010 07:27:03 +0000 (07:27 +0000)
* 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
PATCHSETS
configure.ac
src/prefs_account.c
src/prefs_filtering_action.c
src/prefs_matcher.c

index a7fbc4b..d53e98f 100644 (file)
--- 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
index 544e0bb..b7e8ec5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 4511b77..818426e 100644 (file)
@@ -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=
 
index de966f8..db7ff30 100644 (file)
@@ -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));
index 2c7f665..15418a4 100644 (file)
@@ -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);
index 4cfc74f..cac1b2a 100644 (file)
@@ -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;