[Commits] spamassassin_gtk.c 1.23.2.57 1.23.2.58

[colin at claws-mail.org]

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

Modified Files:
      Tag: gtk2
	spamassassin_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: spamassassin_gtk.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/spamassassin/spamassassin_gtk.c,v
retrieving revision 1.23.2.57
retrieving revision 1.23.2.58
diff -u -d -r1.23.2.57 -r1.23.2.58
--- spamassassin_gtk.c	22 Oct 2011 17:09:05 -0000	1.23.2.57
+++ spamassassin_gtk.c	1 Apr 2012 18:45:27 -0000	1.23.2.58
@@ -92,6 +92,7 @@
 	{ N_("Unix Socket"),	SPAMASSASSIN_TRANSPORT_UNIX,		PAGE_UNIX,    0 },
 };
 
+#ifndef USE_NEW_ADDRBOOK
 static void spamassassin_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)
 {
 	struct SpamAssassinPage *page = (struct SpamAssassinPage *) data;
@@ -105,6 +106,7 @@
 		g_free(new_path);
 	} 
 }
+#endif
 
 static void foldersel_cb(GtkWidget *widget, gpointer data)
 {
@@ -456,14 +458,19 @@
 	SET_TOGGLE_SENSITIVITY(enable_sa_checkbtn, hbox_process_emails);
 	SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, mark_as_read_checkbtn);
 	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
 	config = spamassassin_get_config();
 
 	g_signal_connect(G_OBJECT(save_spam_folder_select), "clicked",
 			G_CALLBACK(foldersel_cb), page);
+#ifndef USE_NEW_ADDRBOOK
 	g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked",
 			 G_CALLBACK(spamassassin_whitelist_ab_select_cb), page);
+#else
+	gtk_widget_set_sensitive(GTK_WIDGET(whitelist_ab_select_btn), FALSE);
+#endif
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_sa_checkbtn), config->enable);
 	if (config->username != NULL)