[Commits] bogofilter_gtk.c 1.1.2.40 1.1.2.41

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/plugins/bogofilter
In directory srv:/tmp/cvs-serv11566/src/plugins/bogofilter

Modified Files:
      Tag: gtk2
	bogofilter_gtk.c 
Log Message:
2012-04-01 [colin]	3.8.0cvs36

	* configure.ac
	* src/.cvsignore
	* src/Makefile.am
	* src/addr_compl.c
	* src/addressadd.c
	* src/addressadd.h
	* src/addressbook-dbus.c
	* src/addressbook-dbus.h
	* src/addrgather.c
	* src/addrgather.h
	* src/addrharvest.c
	* src/addrharvest.h
	* src/claws-contacts.xml
	* src/compose.c
	* src/compose.h
	* src/filtering.c
	* src/headerview.c
	* src/main.c
	* src/mainwindow.c
	* src/messageview.c
	* src/prefs_common.c
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
	* src/summaryview.c
	* src/textview.c
	* src/toolbar.c
	* src/plugins/bogofilter/bogofilter_gtk.c
	* src/plugins/dillo_viewer/dillo_prefs.c
	* src/plugins/spamassassin/spamassassin_gtk.c
	* src/plugins/trayicon/trayicon.c
		Import new addressbook code from the new-contacts branch

Index: bogofilter_gtk.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/bogofilter/Attic/bogofilter_gtk.c,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -u -d -r1.1.2.40 -r1.1.2.41
--- bogofilter_gtk.c	22 Oct 2011 17:09:04 -0000	1.1.2.40
+++ bogofilter_gtk.c	1 Apr 2012 18:45:27 -0000	1.1.2.41
@@ -78,6 +78,7 @@
 	}
 }
 
+#ifndef USE_NEW_ADDRBOOK
 static void bogofilter_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)
 {
 	struct BogofilterPage *page = (struct BogofilterPage *) data;
@@ -91,6 +92,7 @@
 		g_free(new_path);
 	} 
 }
+#endif
 
 static void bogofilter_create_widget_func(PrefsPage * _page,
 					    GtkWindow * window,
@@ -268,7 +270,9 @@
 	SET_TOGGLE_SENSITIVITY(save_unsure_checkbtn, save_unsure_folder_entry);
 	SET_TOGGLE_SENSITIVITY(save_unsure_checkbtn, save_unsure_folder_select);
 	SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_folder_combo);
+#ifndef USE_NEW_ADDRBOOK
 	SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_select_btn);
+#endif
 	SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, learn_from_whitelist_chkbtn);
 	SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, mark_as_read_checkbtn);
 
@@ -278,9 +282,12 @@
 			G_CALLBACK(foldersel_cb), save_spam_folder_entry);
 	g_signal_connect(G_OBJECT(save_unsure_folder_select), "clicked",
 			G_CALLBACK(foldersel_cb), save_unsure_folder_entry);
+#ifndef USE_NEW_ADDRBOOK
 	g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked",
 			 G_CALLBACK(bogofilter_whitelist_ab_select_cb), page);
-
+#else
+	gtk_widget_set_sensitive(GTK_WIDGET(whitelist_ab_select_btn), FALSE);
+#endif
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(max_size_spinbtn), (float) config->max_size);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(process_emails_checkbtn), config->process_emails);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(save_spam_checkbtn), config->receive_spam);