2012-04-01 [colin] 3.8.0cvs36

[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 bb836e7b91a9e2c95000c81de06b3d44f64ccd2a..e523cccee9e86be129d8421b87205821185a53bf 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-2007 the Claws Mail Team
+ * Copyright (C) 1999-2011 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
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkutils.h>
+#include "gtk/gtkutils.h"
 
 #include "common/claws.h"
 #include "common/version.h"
@@ -92,19 +92,21 @@ 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;
        const gchar *folderpath = NULL;
        gchar *new_path = NULL;
 
-       folderpath = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(page->whitelist_ab_folder_combo)->child));
+       folderpath = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))));
        new_path = addressbook_folder_selection(folderpath);
        if (new_path) {
-               gtk_entry_set_text(GTK_ENTRY(GTK_BIN(page->whitelist_ab_folder_combo)->child), new_path);
+               gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), new_path);
                g_free(new_path);
        } 
 }
+#endif
 
 static void foldersel_cb(GtkWidget *widget, gpointer data)
 {
@@ -192,7 +194,7 @@ static void transport_sel_cb(GtkMenuItem *menuitem, gpointer data)
        GtkTreeModel *model;
        GtkTreeIter iter;
        
-       g_return_if_fail(gtk_combo_box_get_active_iter(
+       cm_return_if_fail(gtk_combo_box_get_active_iter(
                        GTK_COMBO_BOX(page->transport_optmenu), &iter));
        
        model = gtk_combo_box_get_model(GTK_COMBO_BOX(page->transport_optmenu));                        
@@ -229,17 +231,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 +256,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 +337,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, 10);
+       spamd_port_spinbtn_adj = 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 +358,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, 10);
+       max_size_spinbtn_adj = 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 +378,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, 10);
+       timeout_spinbtn_adj = 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);
@@ -457,14 +458,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)
@@ -476,15 +482,15 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        if (config->whitelist_ab_folder != NULL) {
                /* translate "Any" (stored UNtranslated) */
                if (strcasecmp(config->whitelist_ab_folder, "Any") == 0)
-                       gtk_entry_set_text(GTK_ENTRY(GTK_BIN(whitelist_ab_folder_combo)->child),
+                       gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
                                        config->whitelist_ab_folder);
                else
                /* backward compatibility (when translated "Any" was stored) */
                if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0)
-                       gtk_entry_set_text(GTK_ENTRY(GTK_BIN(whitelist_ab_folder_combo)->child),
+                       gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
                                        config->whitelist_ab_folder);
                else
-                       gtk_entry_set_text(GTK_ENTRY(GTK_BIN(whitelist_ab_folder_combo)->child),
+                       gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
                                        config->whitelist_ab_folder);
        }
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spamd_port_spinbtn), (float) config->port);
@@ -601,7 +607,7 @@ static void spamassassin_save_func(PrefsPage *_page)
        config->whitelist_ab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->whitelist_ab));
        g_free(config->whitelist_ab_folder);
        config->whitelist_ab_folder = gtk_editable_get_chars(
-                               GTK_EDITABLE(GTK_BIN(page->whitelist_ab_folder_combo)->child), 0, -1);
+                               GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), 0, -1);
        /* store UNtranslated "Any" */
        if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0) {
                g_free(config->whitelist_ab_folder);