/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <gtk/gtkutils.h>
#include "common/sylpheed.h"
#include "common/version.h"
-#include "intl.h"
#include "plugin.h"
#include "common/utils.h"
#include "prefs.h"
#include "prefs_gtk.h"
#include "foldersel.h"
#include "spamassassin.h"
+#include "statusbar.h"
+#include "menu.h"
struct SpamAssassinPage
{
};
enum {
- PAGE_NETWORK = 0,
- PAGE_UNIX = 1,
+ PAGE_DISABLED = 0,
+ PAGE_NETWORK = 1,
+ PAGE_UNIX = 2,
};
enum {
};
struct Transport transports[] = {
- { N_("Disabled"), SPAMASSASSIN_DISABLED, PAGE_NETWORK, 0 },
+ { N_("Disabled"), SPAMASSASSIN_DISABLED, PAGE_DISABLED, 0 },
{ N_("Localhost"), SPAMASSASSIN_TRANSPORT_LOCALHOST, PAGE_NETWORK, 0 },
{ N_("TCP"), SPAMASSASSIN_TRANSPORT_TCP, PAGE_NETWORK, NETWORK_HOSTNAME },
{ N_("Unix Socket"), SPAMASSASSIN_TRANSPORT_UNIX, PAGE_UNIX, 0 },
page->trans = transport->transport;
switch (transport->page) {
+ case PAGE_DISABLED:
+ gtk_widget_show(page->hostname);
+ gtk_widget_show(page->colon);
+ gtk_widget_show(page->port);
+ gtk_widget_hide(page->socket);
+ gtk_widget_set_sensitive(page->hostname, FALSE);
+ gtk_widget_set_sensitive(page->colon, FALSE);
+ gtk_widget_set_sensitive(page->port, FALSE);
+ gtk_widget_set_sensitive(page->max_size, FALSE);
+ gtk_widget_set_sensitive(page->timeout, FALSE);
+ break;
+ case PAGE_UNIX:
+ gtk_widget_hide(page->hostname);
+ gtk_widget_hide(page->colon);
+ gtk_widget_hide(page->port);
+ gtk_widget_show(page->socket);
+ gtk_widget_set_sensitive(page->socket, TRUE);
+ gtk_widget_set_sensitive(page->max_size, TRUE);
+ gtk_widget_set_sensitive(page->timeout, TRUE);
+ break;
case PAGE_NETWORK:
+ gtk_widget_show(page->hostname);
+ gtk_widget_show(page->colon);
+ gtk_widget_show(page->port);
+ gtk_widget_hide(page->socket);
+ gtk_widget_set_sensitive(page->max_size, TRUE);
+ gtk_widget_set_sensitive(page->timeout, TRUE);
if (transport->pageflags & NETWORK_HOSTNAME) {
- gtk_widget_show(page->hostname);
- gtk_widget_show(page->colon);
+ gtk_widget_set_sensitive(page->hostname, TRUE);
+ gtk_widget_set_sensitive(page->colon, TRUE);
+ gtk_widget_set_sensitive(page->port, TRUE);
} else {
- gtk_widget_hide(page->hostname);
- gtk_widget_hide(page->colon);
+ gtk_widget_set_sensitive(page->hostname, FALSE);
+ gtk_widget_set_sensitive(page->colon, FALSE);
+ gtk_widget_set_sensitive(page->port, TRUE);
}
break;
default:
break;
}
- gtk_notebook_set_page(GTK_NOTEBOOK(page->transport_notebook), transport->page);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(page->transport_notebook), transport->page);
}
static void transport_sel_cb(GtkMenuItem *menuitem, gpointer data)
struct SpamAssassinPage *page = (struct SpamAssassinPage *) data;
struct Transport *transport;
- transport = (struct Transport *) gtk_object_get_user_data(GTK_OBJECT(menuitem));
+ transport = (struct Transport *) g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID);
show_transport(page, transport);
}
SpamAssassinConfig *config;
guint i, active;
- /*
- * BEGIN GLADE CODE
- * DO NOT EDIT
- */
GtkWidget *table;
GtkWidget *label3;
GtkWidget *label4;
GtkWidget *transport_menu;
GtkWidget *transport_notebook;
GtkWidget *hbox1;
+ GtkWidget *spamd_hbox;
GtkWidget *hostname;
GtkWidget *colon;
GtkObject *port_adj;
GtkObject *timeout_adj;
GtkWidget *timeout;
GtkWidget *label16;
- GtkWidget *label9;
GtkWidget *receive_spam;
GtkWidget *hbox3;
GtkObject *max_size_adj;
GtkWidget *max_size;
GtkWidget *label11;
- GtkWidget *label8;
+ GtkWidget *hbox2;
GtkWidget *save_folder;
- GtkWidget *button4;
+ GtkWidget *save_folder_select;
GtkWidget *label6;
GtkTooltips *tooltips;
tooltips = gtk_tooltips_new();
- table = gtk_table_new(6, 3, FALSE);
+ table = gtk_table_new(8, 3, FALSE);
gtk_widget_show(table);
gtk_container_set_border_width(GTK_CONTAINER(table), 8);
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- label3 = gtk_label_new(_("Transport"));
- gtk_widget_show(label3);
- gtk_table_attach(GTK_TABLE(table), label3, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5);
-
- label4 = gtk_label_new(_("spamd "));
- gtk_widget_show(label4);
- gtk_table_attach(GTK_TABLE(table), label4, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label4), 0, 0.5);
-
- hbox4 = gtk_hbox_new(FALSE, 0);
+ hbox4 = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox4);
- gtk_table_attach(GTK_TABLE(table), hbox4, 1, 2, 0, 1,
+ gtk_table_attach(GTK_TABLE(table), hbox4, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
+ label3 = gtk_label_new(_("Transport"));
+ gtk_widget_show(label3);
+ gtk_box_pack_start(GTK_BOX(hbox4), label3, FALSE, FALSE, 0);
+
transport = gtk_option_menu_new();
gtk_widget_show(transport);
- gtk_box_pack_start(GTK_BOX(hbox4), transport, FALSE, FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox4), transport, FALSE, FALSE, 0);
transport_menu = gtk_menu_new();
transport_notebook = gtk_notebook_new();
gtk_notebook_set_show_border(GTK_NOTEBOOK(transport_notebook),
FALSE);
- hbox1 = gtk_hbox_new(FALSE, 0);
+ hbox1 = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox1);
gtk_container_add(GTK_CONTAINER(transport_notebook), hbox1);
- hostname = gtk_entry_new();
- gtk_widget_show(hostname);
- gtk_box_pack_start(GTK_BOX(hbox1), hostname, TRUE, TRUE, 0);
- gtk_tooltips_set_tip(tooltips, hostname,
- _("Hostname or IP address of spamd server"),
- NULL);
+ spamd_hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (spamd_hbox);
+ gtk_table_attach (GTK_TABLE (table), spamd_hbox, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
- colon = gtk_label_new(_(":"));
- gtk_widget_show(colon);
- gtk_box_pack_start(GTK_BOX(hbox1), colon, FALSE, FALSE, 0);
- gtk_misc_set_padding(GTK_MISC(colon), 8, 0);
+ label4 = gtk_label_new(_("spamd"));
+ gtk_widget_show(label4);
+ gtk_box_pack_start(GTK_BOX(spamd_hbox), label4, FALSE, FALSE, 0);
port_adj = gtk_adjustment_new(783, 1, 65535, 1, 10, 10);
port = gtk_spin_button_new(GTK_ADJUSTMENT(port_adj), 1, 0);
gtk_widget_show(port);
- gtk_box_pack_end(GTK_BOX(hbox1), port, FALSE, TRUE, 0);
- gtk_widget_set_usize(port, 64, -2);
+ gtk_box_pack_end(GTK_BOX(spamd_hbox), port, FALSE, FALSE, 0);
gtk_tooltips_set_tip(tooltips, port, _("Port of spamd server"),
NULL);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(port), TRUE);
+ colon = gtk_label_new(_(":"));
+ gtk_widget_show(colon);
+ gtk_box_pack_end(GTK_BOX(spamd_hbox), colon, FALSE, FALSE, 0);
+
+ hostname = gtk_entry_new();
+ gtk_widget_show(hostname);
+ gtk_box_pack_end(GTK_BOX(spamd_hbox), hostname, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip(tooltips, hostname,
+ _("Hostname or IP address of spamd server"),
+ NULL);
+
socket = gtk_entry_new();
gtk_widget_show(socket);
- gtk_container_add(GTK_CONTAINER(transport_notebook), socket);
+ gtk_box_pack_end(GTK_BOX(spamd_hbox), socket, FALSE, FALSE, 0);
gtk_tooltips_set_tip(tooltips, socket, _("Path of Unix socket"),
NULL);
- label15 = gtk_label_new(_("Timeout"));
- gtk_widget_show(label15);
- gtk_table_attach(GTK_TABLE(table), label15, 0, 1, 5, 6,
+ hbox3 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox3);
+ gtk_table_attach (GTK_TABLE (table), hbox3, 0, 1, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ label6 = gtk_label_new(_("Maximum Size"));
+ gtk_widget_show(label6);
+ gtk_box_pack_start(GTK_BOX(hbox3), label6, FALSE, FALSE, 0);
+
+ max_size_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 10);
+ max_size = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_adj), 1, 0);
+ gtk_widget_show(max_size);
+ gtk_box_pack_end(GTK_BOX(hbox3), max_size, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip(tooltips, max_size,
+ _("Maximum size a message is allowed to have to be checked"),
+ NULL);
+ gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size), TRUE);
+
+ label11 = gtk_label_new(_("kB"));
+ gtk_widget_show(label11);
+ gtk_table_attach(GTK_TABLE(table), label11, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label15), 0, 0.5);
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
- hbox6 = gtk_hbox_new(FALSE, 0);
+ hbox6 = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox6);
- gtk_table_attach(GTK_TABLE(table), hbox6, 1, 2, 5, 6,
+ gtk_table_attach(GTK_TABLE(table), hbox6, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
+ label15 = gtk_label_new(_("Timeout"));
+ gtk_widget_show(label15);
+ gtk_box_pack_start(GTK_BOX(hbox6), label15, FALSE, FALSE, 0);
+
timeout_adj = gtk_adjustment_new(60, 0, 10000, 10, 10, 10);
timeout = gtk_spin_button_new(GTK_ADJUSTMENT(timeout_adj), 1, 0);
gtk_widget_show(timeout);
- gtk_box_pack_end(GTK_BOX(hbox6), timeout, FALSE, TRUE, 0);
- gtk_widget_set_usize(timeout, 64, -2);
+ gtk_box_pack_end(GTK_BOX(hbox6), timeout, FALSE, FALSE, 0);
gtk_tooltips_set_tip(tooltips, timeout,
- _
- ("Time that is allowed for checking. If the check takes longer the check will be aborted and the message will be handled as not spam."),
- NULL);
+ _("Time that is allowed for checking. If the check takes longer the check will be aborted and the message will be handled as not spam."),
+ NULL);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(timeout), TRUE);
label16 = gtk_label_new(_("s"));
gtk_widget_show(label16);
- gtk_table_attach(GTK_TABLE(table), label16, 2, 3, 5, 6,
+ gtk_table_attach(GTK_TABLE(table), label16, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label16), 0, 0.5);
-
- label9 = gtk_label_new(_("Save Spam"));
- gtk_widget_show(label9);
- gtk_table_attach(GTK_TABLE(table), label9, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label9), 0, 0.5);
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
- receive_spam = gtk_check_button_new_with_label("");
+ receive_spam = gtk_check_button_new_with_label(_("Save Spam"));
gtk_widget_show(receive_spam);
- gtk_table_attach(GTK_TABLE(table), receive_spam, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ gtk_table_attach(GTK_TABLE(table), receive_spam, 0, 1, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip(tooltips, receive_spam,
- _
- ("Save mails that where identified as spam to a folder"),
+ _("Save mails that where identified as spam"),
NULL);
- hbox3 = gtk_hbox_new(FALSE, 0);
- gtk_widget_show(hbox3);
- gtk_table_attach(GTK_TABLE(table), hbox3, 1, 2, 4, 5,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
+ hbox2 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox2);
+ gtk_table_attach (GTK_TABLE (table), hbox2, 0, 1, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+ SET_TOGGLE_SENSITIVITY (receive_spam, hbox2);
- max_size_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 10);
- max_size = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_adj), 1, 0);
- gtk_widget_show(max_size);
- gtk_box_pack_end(GTK_BOX(hbox3), max_size, FALSE, TRUE, 0);
- gtk_widget_set_usize(max_size, 64, -2);
- gtk_tooltips_set_tip(tooltips, max_size,
- _
- ("Maximum size a message is allowed to have to be checked"),
- NULL);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size), TRUE);
-
- label11 = gtk_label_new(_("kB"));
- gtk_widget_show(label11);
- gtk_table_attach(GTK_TABLE(table), label11, 2, 3, 4, 5,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label11), 0, 0.5);
-
- label8 = gtk_label_new(_("Save Folder"));
- gtk_widget_show(label8);
- gtk_table_attach(GTK_TABLE(table), label8, 0, 1, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify(GTK_LABEL(label8), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label8), 0, 0.5);
+ label3 = gtk_label_new (_("Save folder"));
+ gtk_widget_show (label3);
+ gtk_box_pack_start (GTK_BOX (hbox2), label3, FALSE, FALSE, 0);
- save_folder = gtk_entry_new();
- gtk_widget_show(save_folder);
- gtk_table_attach(GTK_TABLE(table), save_folder, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ tooltips = gtk_tooltips_new();
+ save_folder = gtk_entry_new ();
+ gtk_widget_show (save_folder);
+ gtk_box_pack_start (GTK_BOX (hbox2), save_folder, TRUE, FALSE, 0);
gtk_tooltips_set_tip(tooltips, save_folder,
- _
- ("Folder that will be used to save spam. Leave empty to use the default trash folder"),
+ _("Leave empty to use the default trash folder"),
NULL);
- button4 = gtk_button_new_with_label(_("..."));
- gtk_widget_show(button4);
- gtk_table_attach(GTK_TABLE(table), button4, 2, 3, 3, 4,
- (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label6 = gtk_label_new(_("Maximum Size"));
- gtk_widget_show(label6);
- gtk_table_attach(GTK_TABLE(table), label6, 0, 1, 4, 5,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label6), 0, 0.5);
- /*
- * END GLADE CODE
- */
+ save_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
+ gtk_widget_show (save_folder_select);
+ gtk_box_pack_end (GTK_BOX (hbox2), save_folder_select, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip(tooltips, save_folder_select,
+ _("Leave empty to use the default trash folder"),
+ NULL);
config = spamassassin_get_config();
- g_signal_connect(G_OBJECT(button4), "released",
+ g_signal_connect(G_OBJECT(save_folder_select), "released",
G_CALLBACK(foldersel_cb), page);
if (config->hostname != NULL)
GtkWidget *menuitem;
menuitem = gtk_menu_item_new_with_label(gettext(transports[i].name));
- gtk_object_set_user_data(GTK_OBJECT(menuitem), &transports[i]);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(transport_sel_cb), page);
+ g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, &transports[i]);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(transport_sel_cb), page);
gtk_widget_show(menuitem);
gtk_menu_append(GTK_MENU(transport_menu), menuitem);
/* timeout */
config->timeout = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->timeout));
+ if (config->transport == SPAMASSASSIN_DISABLED ||
+ config->transport == SPAMASSASSIN_TRANSPORT_TCP) {
+ procmsg_unregister_spam_learner(spamassassin_learn);
+ procmsg_spam_set_folder(NULL);
+ if (config->transport == SPAMASSASSIN_TRANSPORT_TCP)
+ debug_print("disabling learner as it only works locally\n");
+ } else {
+ procmsg_register_spam_learner(spamassassin_learn);
+ procmsg_spam_set_folder(config->save_folder);
+ }
spamassassin_save_config();
}
+static void gtk_message_callback(gchar *message)
+{
+ statusbar_print_all(message);
+}
+
static struct SpamAssassinPage spamassassin_page;
-gint plugin_init(gchar **error)
+gint spamassassin_gtk_init(void)
{
static gchar *path[3];
- if ((sylpheed_get_version() > VERSION_NUMERIC)) {
- *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
- return -1;
- }
-
- if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
- *error = g_strdup("Your sylpheed version is too old");
- return -1;
- }
-
- path[0] = _("Filtering");
+ path[0] = _("Plugins");
path[1] = _("SpamAssassin");
path[2] = NULL;
spamassassin_page.page.weight = 35.0;
prefs_gtk_register_page((PrefsPage *) &spamassassin_page);
+ spamassassin_set_message_callback(gtk_message_callback);
debug_print("SpamAssassin GTK plugin loaded\n");
return 0;
}
-void plugin_done(void)
-{
- prefs_gtk_unregister_page((PrefsPage *) &spamassassin_page);
-
- debug_print("SpamAssassin GTK plugin unloaded\n");
-}
-
-const gchar *plugin_name(void)
-{
- return _("SpamAssassin GTK");
-}
-
-const gchar *plugin_desc(void)
-{
- return _("This plugin provides a Preferences page for the SpamAssassin "
- "plugin.\n"
- "\n"
- "You will find the options in the Other Preferences window "
- "under Filtering/SpamAssassin.\n"
- "\n"
- "With this plugin you can enable the filtering, change the "
- "SpamAssassin server host and port, set the maximum size of "
- "messages to be checked, (if the message is larger it will "
- "not be checked), configure whether spam mail should be received "
- "(default: Yes) and select the folder where spam mail will be "
- "saved.\n");
-}
-
-const gchar *plugin_type(void)
+void spamassassin_gtk_done(void)
{
- return "GTK2";
+ prefs_gtk_unregister_page((PrefsPage *) &spamassassin_page);
}
projects / claws.git / blobdiff