RSSyl: Allow use of .netrc by libcurl. Bug/enhancement #3309, by Vincent Pelletier

[claws.git] / src / plugins / spamassassin / spamassassin_gtk.c

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 5454a3c8e3714e18fc5aa26c6527050a5c514b39..1121ec25b00505f751fb5f4cb9ed95f681d23b60 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 the Claws Mail Team
+ * Copyright (C) 1999-2012 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -92,6 +93,7 @@ struct Transport transports[] = {
        { 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 +107,7 @@ static void spamassassin_whitelist_ab_select_cb(GtkWidget *widget, gpointer data
                g_free(new_path);
        } 
 }
+#endif
 
 static void foldersel_cb(GtkWidget *widget, gpointer data)
 {
@@ -229,17 +232,17 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        GtkWidget *spamd_label;
        GtkWidget *spamd_hostname_entry;
        GtkWidget *spamd_colon_label;
-       GtkObject *spamd_port_spinbtn_adj;
+       GtkAdjustment *spamd_port_spinbtn_adj;
        GtkWidget *spamd_port_spinbtn;
        GtkWidget *spamd_socket_entry;
 
        GtkWidget *max_size_label;
-       GtkObject *max_size_spinbtn_adj;
+       GtkAdjustment *max_size_spinbtn_adj;
        GtkWidget *max_size_spinbtn;
        GtkWidget *max_size_kb_label;
 
        GtkWidget *timeout_label;
-       GtkObject *timeout_spinbtn_adj;
+       GtkAdjustment *timeout_spinbtn_adj;
        GtkWidget *timeout_spinbtn;
        GtkWidget *timeout_seconds_label;
 
@@ -254,7 +257,6 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        GtkListStore *store;
        GtkCellRenderer *renderer;
        GtkTreeIter iter;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -336,7 +338,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(spamd_colon_label);
        gtk_box_pack_start(GTK_BOX(hbox_spamd), spamd_colon_label, FALSE, FALSE, 0);
 
-       spamd_port_spinbtn_adj = gtk_adjustment_new(783, 1, 65535, 1, 10, 0);
+       spamd_port_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(783, 1, 65535, 1, 10, 0));
        spamd_port_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(spamd_port_spinbtn_adj), 1, 0);
        gtk_widget_show(spamd_port_spinbtn);
        gtk_box_pack_start(GTK_BOX(hbox_spamd), spamd_port_spinbtn, FALSE, FALSE, 0);
@@ -357,7 +359,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(max_size_label);
        gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_label, FALSE, FALSE, 0);
 
-       max_size_spinbtn_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 0);
+       max_size_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(250, 0, 10000, 10, 10, 0));
        max_size_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_spinbtn_adj), 1, 0);
        gtk_widget_show(max_size_spinbtn);
        gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_spinbtn, FALSE, FALSE, 0);
@@ -377,7 +379,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(timeout_label);
        gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_label, FALSE, FALSE, 0);
 
-       timeout_spinbtn_adj = gtk_adjustment_new(60, 0, 10000, 10, 10, 0);
+       timeout_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(60, 0, 10000, 10, 10, 0));
        timeout_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(timeout_spinbtn_adj), 1, 0);
        gtk_widget_show(timeout_spinbtn);
        gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_spinbtn, FALSE, FALSE, 0);
@@ -442,7 +444,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_set_size_request(whitelist_ab_folder_combo, 100, -1);
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_folder_combo, TRUE, TRUE, 0);
 
-       whitelist_ab_select_btn = gtk_button_new_with_label(_("Select ..."));
+       whitelist_ab_select_btn = gtk_button_new_with_label(_("Select..."));
        gtk_widget_show (whitelist_ab_select_btn);
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_select_btn, FALSE, FALSE, 0);
        CLAWS_SET_TIP(whitelist_ab_select_btn,
@@ -457,14 +459,19 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        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)