2012-05-16 [paul] 3.8.0cvs46

	* src/prefs_filtering_action.c
		fix disabled 'select...' button that never goes away
		when using the new addr book

diff --git a/ChangeLog b/ChangeLog
index a6b95cb1f8bfa06aa25c0fb2a6391c6b79cf3f51..5731436369e536c77482312aa8255ae4833794ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-16 [paul]      3.8.0cvs46
+
+       * src/prefs_filtering_action.c
+               fix disabled 'select...' button that never goes away
+               when using the new addr book
+               
+

 2012-05-16 [colin]     3.8.0cvs45
 
        * src/common/utils.c
 2012-05-16 [colin]     3.8.0cvs45
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index ab6e5c84ea3f248acad3197684e91f8a84cc76b9..a926f53ed1cc0d370195b7f2078e6fc2dbe8d1ea 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4362,3 +4362,4 @@
 ( cvs diff -u -r 1.75.2.69 -r 1.75.2.70 src/matcher.c;  ) > 3.8.0cvs43.patchset
 ( cvs diff -u -r 1.36.2.196 -r 1.36.2.197 src/common/utils.c;  ) > 3.8.0cvs44.patchset
 ( cvs diff -u -r 1.36.2.197 -r 1.36.2.198 src/common/utils.c;  ) > 3.8.0cvs45.patchset
 ( cvs diff -u -r 1.75.2.69 -r 1.75.2.70 src/matcher.c;  ) > 3.8.0cvs43.patchset
 ( cvs diff -u -r 1.36.2.196 -r 1.36.2.197 src/common/utils.c;  ) > 3.8.0cvs44.patchset
 ( cvs diff -u -r 1.36.2.197 -r 1.36.2.198 src/common/utils.c;  ) > 3.8.0cvs45.patchset

+( cvs diff -u -r 1.1.4.74 -r 1.1.4.75 src/prefs_filtering_action.c;  ) > 3.8.0cvs46.patchset

diff --git a/configure.ac b/configure.ac
index 1e12d8496e95f150f252215be8741929ff16da95..c64adb18741fc9cd4891203d018373b2efde6784 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=45
+EXTRA_VERSION=46

 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 87182471ab02a25a4b04f2019233c282f3ce23b6..1a6d4c786ee704adf89c377003f0530efb0e7292 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -122,7 +122,9 @@ static struct FilteringAction_ {
 #endif
        GtkWidget *header_combo;
        GtkWidget *header_entry;
 #endif
        GtkWidget *header_combo;
        GtkWidget *header_entry;

+#ifndef USE_NEW_ADDRBOOK

        GtkWidget *addressbook_btn;
        GtkWidget *addressbook_btn;

+#endif

        GtkWidget *score_entry;
        GtkWidget *tags_combo;
 
        GtkWidget *score_entry;
        GtkWidget *tags_combo;
 


@@ -342,7 +344,9 @@ static void prefs_filtering_action_create(void)
        GtkWidget *account_combo;
        GtkWidget *header_combo;
        GtkWidget *header_entry;
        GtkWidget *account_combo;
        GtkWidget *header_combo;
        GtkWidget *header_entry;

+#ifndef USE_NEW_ADDRBOOK

        GtkWidget *addressbook_btn;
        GtkWidget *addressbook_btn;

+#endif

        GtkWidget *dest_entry;
        GtkWidget *dest_btn;
        GtkWidget *score_entry;
        GtkWidget *dest_entry;
        GtkWidget *dest_btn;
        GtkWidget *score_entry;


@@ -550,15 +554,14 @@ static void prefs_filtering_action_create(void)
                          G_CALLBACK(prefs_filtering_action_select_dest),
                          NULL);
 
                          G_CALLBACK(prefs_filtering_action_select_dest),
                          NULL);
 

+#ifndef USE_NEW_ADDRBOOK

        addressbook_btn = gtk_button_new_with_label (_("Select ..."));
        gtk_box_pack_start (GTK_BOX (hbox1), addressbook_btn, FALSE, FALSE, 0);
        addressbook_btn = gtk_button_new_with_label (_("Select ..."));
        gtk_box_pack_start (GTK_BOX (hbox1), addressbook_btn, FALSE, FALSE, 0);

-#ifndef USE_NEW_ADDRBOOK

        g_signal_connect (G_OBJECT (addressbook_btn), "clicked",
                          G_CALLBACK(prefs_filtering_action_select_addressbook),
                          NULL);
        g_signal_connect (G_OBJECT (addressbook_btn), "clicked",
                          G_CALLBACK(prefs_filtering_action_select_addressbook),
                          NULL);

-#else
-       gtk_widget_set_sensitive(GTK_WIDGET(addressbook_btn), FALSE);

 #endif
 #endif

+

        exec_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
        gtk_box_pack_start (GTK_BOX (hbox1), exec_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (exec_btn), "clicked",
        exec_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
        gtk_box_pack_start (GTK_BOX (hbox1), exec_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (exec_btn), "clicked",


@@ -1373,10 +1376,10 @@ static void prefs_filtering_action_type_selection_changed(GtkWidget *combo,
 
        prefs_filtering_action_enable_widget(filtering_action.header_combo,
                                        (value == ACTION_ADD_TO_ADDRESSBOOK));  
 
        prefs_filtering_action_enable_widget(filtering_action.header_combo,
                                        (value == ACTION_ADD_TO_ADDRESSBOOK));  

-
+#ifndef USE_NEW_ADDRBOOK

        prefs_filtering_action_enable_widget(filtering_action.addressbook_btn,
                                        (value == ACTION_ADD_TO_ADDRESSBOOK));
        prefs_filtering_action_enable_widget(filtering_action.addressbook_btn,
                                        (value == ACTION_ADD_TO_ADDRESSBOOK));

-
+#endif

        prefs_filtering_action_enable_widget(filtering_action.score_entry,
                                                ACTION_SCORE(value));
                
        prefs_filtering_action_enable_widget(filtering_action.score_entry,
                                                ACTION_SCORE(value));