2009-12-29 [pawel] 3.7.3cvs47

	* src/prefs_filtering_action.c
		Fix Bug 2082 'Wrong color rectangle position when replacing
		"color" processing rule'

diff --git a/ChangeLog b/ChangeLog
index 0ab25e82543cfd31adaf66d5c8987bda0e864fed..0b0cf59aa105e72846b168b1ee320ba04ad99cbf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-29 [pawel]     3.7.3cvs47
+
+       * src/prefs_filtering_action.c
+               Fix Bug 2082 'Wrong color rectangle position when replacing
+               "color" processing rule'
+

 2009-12-29 [colin]     3.7.3cvs46
 
        * src/compose.c
 2009-12-29 [colin]     3.7.3cvs46
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 8989c1b8a88490ec7783449546df978929522158..74c8f6ea9cefcb44f446901d5ffbc406d2463b00 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3920,3 +3920,4 @@
 ( cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/prefs_toolbar.h;  ) > 3.7.3cvs44.patchset
 ( cvs diff -u -r 1.382.2.538 -r 1.382.2.539 src/compose.c;  ) > 3.7.3cvs45.patchset
 ( cvs diff -u -r 1.382.2.539 -r 1.382.2.540 src/compose.c;  ) > 3.7.3cvs46.patchset
 ( cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/prefs_toolbar.h;  ) > 3.7.3cvs44.patchset
 ( cvs diff -u -r 1.382.2.538 -r 1.382.2.539 src/compose.c;  ) > 3.7.3cvs45.patchset
 ( cvs diff -u -r 1.382.2.539 -r 1.382.2.540 src/compose.c;  ) > 3.7.3cvs46.patchset

+( cvs diff -u -r 1.1.4.61 -r 1.1.4.62 src/prefs_filtering_action.c;  ) > 3.7.3cvs47.patchset

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

-EXTRA_VERSION=46
+EXTRA_VERSION=47

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index abae26fbb2c822e276d2fdbce0559d44ce500820..dfbfc979e720e5046a9a1978920cc070fb8c4d7c 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -1472,6 +1472,7 @@ static gboolean prefs_filtering_actions_selected
        gint list_id;
        GtkTreeIter iter;
        gboolean is_valid;
        gint list_id;
        GtkTreeIter iter;
        gboolean is_valid;

+       GtkWidget *menu;

 
        if (currently_selected)
                return TRUE;
 
        if (currently_selected)
                return TRUE;


@@ -1576,6 +1577,9 @@ static gboolean prefs_filtering_actions_selected
                                     ACTION_COLOR);
                gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(filtering_action.color_optmenu),
                                            action->labelcolor);     
                                     ACTION_COLOR);
                gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(filtering_action.color_optmenu),
                                            action->labelcolor);     

+               menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(
+                                               filtering_action.color_optmenu));
+               g_signal_emit_by_name(G_OBJECT(menu), "selection-done", menu);

                break;
        case MATCHACTION_CHANGE_SCORE:
                combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo),
                break;
        case MATCHACTION_CHANGE_SCORE:
                combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo),