2007-01-13 [colin] 2.7.0cvs21

[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 1f17b79717f36f04922b1119b3dc288a549c3280..86c66f156c65b19d56072657ac7fea7b6983b137 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and 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
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkutils.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "common/utils.h"
@@ -236,11 +236,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(enable_sa_checkbtn);
        gtk_box_pack_start(GTK_BOX(vbox2), enable_sa_checkbtn, TRUE, TRUE, 0);
 
-       PACK_FRAME(vbox2, frame_transport, _("Transport"));
-       vbox_transport = gtk_vbox_new (FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox_transport);
-       gtk_container_add (GTK_CONTAINER (frame_transport), vbox_transport);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox_transport), 8);
+       vbox_transport = gtkut_get_options_frame(vbox2, &frame_transport, _("Transport"));
 
        table_transport = gtk_table_new (3, 3, FALSE);
        gtk_widget_show (table_transport);
@@ -401,7 +397,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 
        config = spamassassin_get_config();
 
-       g_signal_connect(G_OBJECT(save_spam_folder_select), "released",
+       g_signal_connect(G_OBJECT(save_spam_folder_select), "clicked",
                        G_CALLBACK(foldersel_cb), page);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_sa_checkbtn), config->enable);
@@ -448,6 +444,15 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
                if (config->transport == transports[i].transport) {
                        show_transport(page, &transports[i]);
                        active = i;
+               } else if (config->transport == SPAMASSASSIN_DISABLED 
+                       && transports[i].transport == SPAMASSASSIN_TRANSPORT_LOCALHOST) {
+                       show_transport(page, &transports[i]);
+                       active = i;
+                       /* and disable via new way */
+                       config->enable = FALSE;
+                       gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(enable_sa_checkbtn), 
+                               config->enable);
                }
        }
        gtk_option_menu_set_menu(GTK_OPTION_MENU(transport_optmenu), transport_menu);