[Commits] prefs_filtering_action.c 1.1.4.74 1.1.4.75

[claws at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv28899/src

Modified Files:
      Tag: gtk2
	prefs_filtering_action.c 
Log Message:
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
		 

Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.74
retrieving revision 1.1.4.75
diff -u -d -r1.1.4.74 -r1.1.4.75
--- prefs_filtering_action.c	1 Apr 2012 18:45:26 -0000	1.1.4.74
+++ prefs_filtering_action.c	16 May 2012 08:54:27 -0000	1.1.4.75
@@ -122,7 +122,9 @@
 #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 @@
 	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 @@
 			  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 @@
 
 	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));