2012-05-16 [paul] 3.8.0cvs46
authorPaul Mangan <paul@claws-mail.org>
Wed, 16 May 2012 08:54:27 +0000 (08:54 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 16 May 2012 08:54:27 +0000 (08:54 +0000)
* src/prefs_filtering_action.c
fix disabled 'select...' button that never goes away
when using the new addr book

ChangeLog
PATCHSETS
configure.ac
src/prefs_filtering_action.c

index a6b95cb..5731436 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
index ab6e5c8..a926f53 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 1e12d84..c64adb1 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 8718247..1a6d4c7 100644 (file)
@@ -122,7 +122,9 @@ static struct FilteringAction_ {
 #endif
        GtkWidget *header_combo;
        GtkWidget *header_entry;
+#ifndef USE_NEW_ADDRBOOK
        GtkWidget *addressbook_btn;
+#endif
        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;
+#ifndef USE_NEW_ADDRBOOK
        GtkWidget *addressbook_btn;
+#endif
        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);
 
+#ifndef USE_NEW_ADDRBOOK
        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);
-#else
-       gtk_widget_set_sensitive(GTK_WIDGET(addressbook_btn), FALSE);
 #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",
@@ -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));  
-
+#ifndef USE_NEW_ADDRBOOK
        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));