*
* 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
{
PrefsPage page;
- GtkWidget *enable;
+ GtkWidget *transport;
+ GtkWidget *transport_notebook;
GtkWidget *hostname;
+ GtkWidget *colon;
GtkWidget *port;
- GtkWidget *max_size;
+ GtkWidget *socket;
GtkWidget *receive_spam;
GtkWidget *save_folder;
+ GtkWidget *max_size;
+ GtkWidget *timeout;
+
+ SpamAssassinTransport trans;
+};
+
+struct Transport
+{
+ gchar *name;
+ SpamAssassinTransport transport;
+ guint page;
+ guint pageflags;
+};
+
+enum {
+ PAGE_NETWORK = 0,
+ PAGE_UNIX = 1,
+};
+
+enum {
+ NETWORK_HOSTNAME = 1,
+};
+
+struct Transport transports[] = {
+ { N_("Disabled"), SPAMASSASSIN_DISABLED, PAGE_NETWORK, 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 },
};
static void foldersel_cb(GtkWidget *widget, gpointer data)
}
}
+static void show_transport(struct SpamAssassinPage *page, struct Transport *transport)
+{
+ page->trans = transport->transport;
+
+ switch (transport->page) {
+ case PAGE_NETWORK:
+ if (transport->pageflags & NETWORK_HOSTNAME) {
+ gtk_widget_show(page->hostname);
+ gtk_widget_show(page->colon);
+ } else {
+ gtk_widget_hide(page->hostname);
+ gtk_widget_hide(page->colon);
+ }
+ break;
+ default:
+ break;
+ }
+ 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 *) g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID);
+ show_transport(page, transport);
+}
+
static void spamassassin_create_widget_func(PrefsPage * _page,
GtkWindow * window,
gpointer data)
{
struct SpamAssassinPage *page = (struct SpamAssassinPage *) _page;
SpamAssassinConfig *config;
+ guint i, active;
/*
* BEGIN GLADE CODE
* DO NOT EDIT
*/
- GtkWidget *table1;
+ GtkWidget *table;
GtkWidget *label3;
GtkWidget *label4;
- GtkWidget *label6;
- GtkWidget *label8;
- GtkWidget *label9;
+ GtkWidget *hbox4;
+ GtkWidget *transport;
+ GtkWidget *transport_menu;
+ GtkWidget *transport_notebook;
GtkWidget *hbox1;
GtkWidget *hostname;
- GtkWidget *label5;
+ GtkWidget *colon;
GtkObject *port_adj;
GtkWidget *port;
- GtkWidget *enable;
+ GtkWidget *socket;
+ GtkWidget *label15;
+ GtkWidget *hbox6;
+ GtkObject *timeout_adj;
+ GtkWidget *timeout;
+ GtkWidget *label16;
+ GtkWidget *label9;
GtkWidget *receive_spam;
- GtkWidget *save_folder;
- GtkWidget *button4;
- GtkWidget *label11;
GtkWidget *hbox3;
GtkObject *max_size_adj;
GtkWidget *max_size;
+ GtkWidget *label11;
+ GtkWidget *label8;
+ GtkWidget *save_folder;
+ GtkWidget *button4;
+ GtkWidget *label6;
GtkTooltips *tooltips;
tooltips = gtk_tooltips_new();
- table1 = gtk_table_new(5, 3, FALSE);
- gtk_widget_show(table1);
- gtk_container_set_border_width(GTK_CONTAINER(table1), 8);
- gtk_table_set_row_spacings(GTK_TABLE(table1), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table1), 8);
+ table = gtk_table_new(6, 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(_("Enable"));
+ label3 = gtk_label_new(_("Transport"));
gtk_widget_show(label3);
- gtk_table_attach(GTK_TABLE(table1), label3, 0, 1, 0, 1,
+ 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(table1), label4, 0, 1, 1, 2,
+ 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);
- label6 = gtk_label_new(_("Maximum Size"));
- gtk_widget_show(label6);
- gtk_table_attach(GTK_TABLE(table1), label6, 0, 1, 2, 3,
+ hbox4 = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(hbox4);
+ gtk_table_attach(GTK_TABLE(table), hbox4, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label6), 0, 0.5);
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
- label8 = gtk_label_new(_("Save Folder"));
- gtk_widget_show(label8);
- gtk_table_attach(GTK_TABLE(table1), label8, 0, 1, 4, 5,
- (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);
+ transport = gtk_option_menu_new();
+ gtk_widget_show(transport);
+ gtk_box_pack_start(GTK_BOX(hbox4), transport, FALSE, FALSE, 0);
+ transport_menu = gtk_menu_new();
- label9 = gtk_label_new(_("Save Spam"));
- gtk_widget_show(label9);
- gtk_table_attach(GTK_TABLE(table1), label9, 0, 1, 3, 4,
+ transport_notebook = gtk_notebook_new();
+ gtk_widget_show(transport_notebook);
+ gtk_table_attach(GTK_TABLE(table), transport_notebook, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label9), 0, 0.5);
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+ GTK_WIDGET_UNSET_FLAGS(transport_notebook, GTK_CAN_FOCUS);
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(transport_notebook),
+ FALSE);
+ gtk_notebook_set_show_border(GTK_NOTEBOOK(transport_notebook),
+ FALSE);
hbox1 = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox1);
- gtk_table_attach(GTK_TABLE(table1), hbox1, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
+ gtk_container_add(GTK_CONTAINER(transport_notebook), hbox1);
hostname = gtk_entry_new();
gtk_widget_show(hostname);
_("Hostname or IP address of spamd server"),
NULL);
- label5 = gtk_label_new(_(":"));
- gtk_widget_show(label5);
- gtk_box_pack_start(GTK_BOX(hbox1), label5, FALSE, FALSE, 0);
- gtk_misc_set_padding(GTK_MISC(label5), 8, 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);
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_widget_set_size_request(port, 64, -2);
gtk_tooltips_set_tip(tooltips, port, _("Port of spamd server"),
NULL);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(port), TRUE);
- enable = gtk_check_button_new_with_label("");
- gtk_widget_show(enable);
- gtk_table_attach(GTK_TABLE(table1), enable, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ socket = gtk_entry_new();
+ gtk_widget_show(socket);
+ gtk_container_add(GTK_CONTAINER(transport_notebook), socket);
+ 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,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(label15), 0, 0.5);
+
+ hbox6 = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(hbox6);
+ gtk_table_attach(GTK_TABLE(table), hbox6, 1, 2, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 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_size_request(timeout, 64, -2);
+ 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);
+ 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,
+ (GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_tooltips_set_tip(tooltips, enable,
- _("Enable SpamAssassin filtering"), NULL);
+ 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);
receive_spam = gtk_check_button_new_with_label("");
gtk_widget_show(receive_spam);
- gtk_table_attach(GTK_TABLE(table1), receive_spam, 1, 2, 3, 4,
+ gtk_table_attach(GTK_TABLE(table), receive_spam, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip(tooltips, receive_spam,
("Save mails that where identified as spam to a folder"),
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);
+
+ 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_size_request(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);
+
save_folder = gtk_entry_new();
gtk_widget_show(save_folder);
- gtk_table_attach(GTK_TABLE(table1), save_folder, 1, 2, 4, 5,
+ gtk_table_attach(GTK_TABLE(table), save_folder, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip(tooltips, save_folder,
("Folder that will be used to save spam. Leave empty to use the default trash folder"),
NULL);
- button4 = gtk_button_new_with_label(_("..."));
+ button4 = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show(button4);
- gtk_table_attach(GTK_TABLE(table1), button4, 2, 3, 4, 5,
+ gtk_table_attach(GTK_TABLE(table), button4, 2, 3, 3, 4,
(GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- label11 = gtk_label_new(_("kB"));
- gtk_widget_show(label11);
- gtk_table_attach(GTK_TABLE(table1), label11, 2, 3, 2, 3,
+ 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(label11), 0, 0.5);
-
- hbox3 = gtk_hbox_new(FALSE, 0);
- gtk_widget_show(hbox3);
- gtk_table_attach(GTK_TABLE(table1), hbox3, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 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, 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);
+ gtk_misc_set_alignment(GTK_MISC(label6), 0, 0.5);
/*
* END GLADE CODE
*/
config = spamassassin_get_config();
- gtk_signal_connect(GTK_OBJECT(button4), "released", GTK_SIGNAL_FUNC(foldersel_cb), page);
+ g_signal_connect(G_OBJECT(button4), "released",
+ G_CALLBACK(foldersel_cb), page);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable), config->enable);
if (config->hostname != NULL)
gtk_entry_set_text(GTK_ENTRY(hostname), config->hostname);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(port), (float) config->port);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(max_size), (float) config->max_size);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(receive_spam), config->receive_spam);
if (config->save_folder != NULL)
gtk_entry_set_text(GTK_ENTRY(save_folder), config->save_folder);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(max_size), (float) config->max_size);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(timeout), (float) config->timeout);
- page->enable = enable;
+ page->transport = transport;
+ page->transport_notebook = transport_notebook;
page->hostname = hostname;
+ page->colon = colon;
page->port = port;
- page->max_size = max_size;
+ page->socket = socket;
page->receive_spam = receive_spam;
page->save_folder = save_folder;
+ page->max_size = max_size;
+ page->timeout = timeout;
+
+ active = 0;
+ for (i = 0; i < (sizeof(transports) / sizeof(struct Transport)); i++) {
+ GtkWidget *menuitem;
+
+ menuitem = gtk_menu_item_new_with_label(gettext(transports[i].name));
+ 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);
+
+ if (config->transport == transports[i].transport) {
+ show_transport(page, &transports[i]);
+ active = i;
+ }
+ }
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(transport), transport_menu);
+ gtk_option_menu_set_history(GTK_OPTION_MENU(transport), active);
- page->page.widget = table1;
+ page->page.widget = table;
}
static void spamassassin_destroy_widget_func(PrefsPage *_page)
config = spamassassin_get_config();
/* enable */
- config->enable = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable));
+ config->transport = page->trans;
/* hostname */
g_free(config->hostname);
/* port */
config->port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->port));
- /* maxsize */
- config->max_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->max_size));
+ /* hostname */
+ g_free(config->socket);
+ config->socket = gtk_editable_get_chars(GTK_EDITABLE(page->socket), 0, -1);
/* receive_spam */
config->receive_spam = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->receive_spam));
g_free(config->save_folder);
config->save_folder = gtk_editable_get_chars(GTK_EDITABLE(page->save_folder), 0, -1);
+ /* max_size */
+ config->max_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->max_size));
+
+ /* timeout */
+ config->timeout = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->timeout));
+
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)
{
- if ((sylpheed_get_version() > VERSION_NUMERIC)) {
- *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
- return -1;
- }
+ static gchar *path[3];
- if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
- *error = g_strdup("Your sylpheed version is too old");
- return -1;
- }
+ path[0] = _("Plugins");
+ path[1] = _("SpamAssassin");
+ path[2] = NULL;
- spamassassin_page.page.path = _("Filtering/SpamAssassin");
+ spamassassin_page.page.path = path;
spamassassin_page.page.create_widget = spamassassin_create_widget_func;
spamassassin_page.page.destroy_widget = spamassassin_destroy_widget_func;
spamassassin_page.page.save_page = spamassassin_save_func;
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 "GTK";
+ prefs_gtk_unregister_page((PrefsPage *) &spamassassin_page);
}
projects / claws.git / blobdiff