2005-12-02 [paul] 1.9.100cvs53

	* src/plugins/clamav/clamav_plugin.c
		int no --> unsigned int no
	* src/plugins/clamav/clamav_plugin_gtk.c
		rework config page

diff --git a/ChangeLog b/ChangeLog
index f64e600bebe8c2a974cc514483cce41be353baa4..79e5da60882bfd5ef4fc9e7216e1f576a7a30e68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-02 [paul]      1.9.100cvs53
+
+       * src/plugins/clamav/clamav_plugin.c
+               int no --> unsigned int no
+       * src/plugins/clamav/clamav_plugin_gtk.c
+               rework config page
+

 2005-12-02 [wwp]       1.9.100cvs52
 
        * src/compose.c
 2005-12-02 [wwp]       1.9.100cvs52
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index e3c8cf55a2fd295a844c03a24cc8d22d507eabdf..af0c3229df743ebc041f7e531b905ef8d4913346 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1036,3 +1036,4 @@
 ( cvs diff -u -r 1.65.2.43 -r 1.65.2.44 src/codeconv.c;  cvs diff -u -r 1.15.2.13 -r 1.15.2.14 src/codeconv.h;  cvs diff -u -r 1.204.2.68 -r 1.204.2.69 src/prefs_common.c;  cvs diff -u -r 1.103.2.36 -r 1.103.2.37 src/prefs_common.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_message.c;  cvs diff -u -r 1.96.2.86 -r 1.96.2.87 src/textview.c;  cvs diff -u -r 1.4.2.25 -r 1.4.2.26 src/gtk/about.c;  ) > 1.9.100cvs50.patchset
 ( cvs diff -u -r 1.204.2.69 -r 1.204.2.70 src/prefs_common.c;  ) > 1.9.100cvs51.patchset
 ( cvs diff -u -r 1.382.2.198 -r 1.382.2.199 src/compose.c;  cvs diff -u -r 1.12.2.17 -r 1.12.2.18 src/prefs_template.c;  cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/quote_fmt.h;  cvs diff -u -r 1.22.2.14 -r 1.22.2.15 src/quote_fmt_parse.y;  ) > 1.9.100cvs52.patchset
 ( cvs diff -u -r 1.65.2.43 -r 1.65.2.44 src/codeconv.c;  cvs diff -u -r 1.15.2.13 -r 1.15.2.14 src/codeconv.h;  cvs diff -u -r 1.204.2.68 -r 1.204.2.69 src/prefs_common.c;  cvs diff -u -r 1.103.2.36 -r 1.103.2.37 src/prefs_common.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_message.c;  cvs diff -u -r 1.96.2.86 -r 1.96.2.87 src/textview.c;  cvs diff -u -r 1.4.2.25 -r 1.4.2.26 src/gtk/about.c;  ) > 1.9.100cvs50.patchset
 ( cvs diff -u -r 1.204.2.69 -r 1.204.2.70 src/prefs_common.c;  ) > 1.9.100cvs51.patchset
 ( cvs diff -u -r 1.382.2.198 -r 1.382.2.199 src/compose.c;  cvs diff -u -r 1.12.2.17 -r 1.12.2.18 src/prefs_template.c;  cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/quote_fmt.h;  cvs diff -u -r 1.22.2.14 -r 1.22.2.15 src/quote_fmt_parse.y;  ) > 1.9.100cvs52.patchset

+( cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/plugins/clamav/clamav_plugin_gtk.c;  ) > 1.9.100cvs53.patchset

diff --git a/configure.ac b/configure.ac
index 2cbe6e1809ea03dd74eb279823e4c018104312c7..cc482b99b32ac97c6fc519a5a3ade5be4743731b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=52
+EXTRA_VERSION=53

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index d1d38943c3be9c93d544a4b728f1a6afe0c6df70..a1aa95ede589afc5b6ae8f03b269a83351d35386 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -190,7 +190,9 @@ void cl_free(struct cl_node *root);
 gint plugin_init(gchar **error)
 {
        gchar *rcpath;
 gint plugin_init(gchar **error)
 {
        gchar *rcpath;

-       int no, ret;
+       int ret;
+       unsigned int no;
+

        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the ClamAV plugin was built with");
                return -1;
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the ClamAV plugin was built with");
                return -1;

diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index f17f22f2a6bfa6a29253f1a0d7b15f95f4a6e8a9..977d75606557ef5fc04c6a90a5a4570f59e3ecfa 100644 (file)
--- a/src/plugins/clamav/clamav_plugin_gtk.c
+++ b/src/plugins/clamav/clamav_plugin_gtk.c
@@ -79,103 +79,79 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
        GtkObject *max_size_adj;
        GtkWidget *max_size;
        GtkWidget *hbox1;
        GtkObject *max_size_adj;
        GtkWidget *max_size;
        GtkWidget *hbox1;

-       GtkWidget *label4;
-       GtkWidget *label5;
+       GtkWidget *hbox2;

        GtkWidget *recv_infected;
        GtkWidget *recv_infected;

-       GtkWidget *label6;

        GtkWidget *save_folder;
        GtkWidget *save_folder_select;
        GtkTooltips *save_folder_tip;
 
        GtkWidget *save_folder;
        GtkWidget *save_folder_select;
        GtkTooltips *save_folder_tip;
 

-       table = gtk_table_new (6, 3, FALSE);
+       table = gtk_table_new (8, 3, FALSE);

        gtk_widget_show(table);
        gtk_widget_show(table);

+       gtk_container_set_border_width(GTK_CONTAINER(table), VBOX_BORDER);

        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 

-       label1 = gtk_label_new(_("Enable virus scanning"));
-       gtk_widget_show (label1);
-       gtk_table_attach (GTK_TABLE (table), label1, 0, 1, 0, 1,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 2, 4);
-       gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT);
-       gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
-
-       enable_clamav = gtk_check_button_new();
+       enable_clamav = gtk_check_button_new_with_label(_("Enable virus scanning"));

        gtk_widget_show (enable_clamav);
        gtk_widget_show (enable_clamav);

-       gtk_table_attach (GTK_TABLE (table), enable_clamav, 1, 2, 0, 1,
+       gtk_table_attach (GTK_TABLE (table), enable_clamav, 0, 1, 0, 1,

                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 

-       label2 = gtk_label_new(_("Scan archive contents"));
-       gtk_widget_show (label2);
-       gtk_table_attach (GTK_TABLE (table), label2, 0, 1, 1, 2,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 2, 4);
-       gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
-
-       enable_arc = gtk_check_button_new();
+       enable_arc = gtk_check_button_new_with_label(_("Scan archive contents"));

        gtk_widget_show (enable_arc);
        gtk_widget_show (enable_arc);

-       gtk_table_attach (GTK_TABLE (table), enable_arc, 1, 2, 1, 2,
+       gtk_table_attach (GTK_TABLE (table), enable_arc, 0, 1, 1, 2,

                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 

-       label3 = gtk_label_new(_("Maximum attachment size"));
-       gtk_widget_show (label3);
-       gtk_table_attach (GTK_TABLE (table), label3, 0, 1, 4, 5,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 2, 4);
-       gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
-
-       hbox1 = gtk_hbox_new (FALSE, 0);
+       hbox1 = gtk_hbox_new (FALSE, 8);

        gtk_widget_show (hbox1);
        gtk_widget_show (hbox1);

-       gtk_table_attach (GTK_TABLE (table), hbox1, 1, 2, 4, 5,
+       gtk_table_attach (GTK_TABLE (table), hbox1, 0, 1, 2, 3,

                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (GTK_FILL), 0, 0);
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (GTK_FILL), 0, 0);

+       SET_TOGGLE_SENSITIVITY (enable_arc, hbox1);
+
+       label1 = gtk_label_new(_("Maximum attachment size"));
+       gtk_widget_show (label1);
+       gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 0);

 
        max_size_adj = gtk_adjustment_new (1, 1, 1024, 1, 10, 10);
        max_size = gtk_spin_button_new (GTK_ADJUSTMENT (max_size_adj), 1, 0);
        gtk_widget_show (max_size);
        gtk_box_pack_start (GTK_BOX (hbox1), max_size, FALSE, FALSE, 0);
 
        max_size_adj = gtk_adjustment_new (1, 1, 1024, 1, 10, 10);
        max_size = gtk_spin_button_new (GTK_ADJUSTMENT (max_size_adj), 1, 0);
        gtk_widget_show (max_size);
        gtk_box_pack_start (GTK_BOX (hbox1), max_size, FALSE, FALSE, 0);

+       gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (max_size), TRUE);

 
 

-       label4 = gtk_label_new(_("MB"));
-       gtk_widget_show (label4);
-       gtk_box_pack_start (GTK_BOX (hbox1), label4, FALSE, FALSE, 0);
-
-       label5 = gtk_label_new(_("Save infected messages"));
-       gtk_widget_show (label5);
-       gtk_table_attach (GTK_TABLE (table), label5, 0, 1, 5, 6,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 2, 4);
-       gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
+       label2 = gtk_label_new(_("MB"));
+       gtk_widget_show (label2);
+       gtk_box_pack_start (GTK_BOX (hbox1), label2, FALSE, FALSE, 0);

 
 

-       recv_infected = gtk_check_button_new();
+       recv_infected = gtk_check_button_new_with_label(_("Save infected messages"));

        gtk_widget_show (recv_infected);
        gtk_widget_show (recv_infected);

-       gtk_table_attach (GTK_TABLE (table), recv_infected, 1, 2, 5, 6,
+       gtk_table_attach (GTK_TABLE (table), recv_infected, 0, 1, 4, 5,

                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 

-       label6 = gtk_label_new (_("Save folder"));
-       gtk_widget_show (label6);
-       gtk_table_attach (GTK_TABLE (table), label6, 0, 1, 6, 7,
+       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),

-                         (GtkAttachOptions) (0), 2, 4);
-       gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5);
+                         (GtkAttachOptions) (GTK_FILL), 0, 0);
+       SET_TOGGLE_SENSITIVITY (recv_infected, hbox2);
+
+       label3 = gtk_label_new (_("Save folder"));
+       gtk_widget_show (label3);
+       gtk_box_pack_start (GTK_BOX (hbox2), label3, FALSE, FALSE, 0);

 
        save_folder_tip = gtk_tooltips_new();
        save_folder = gtk_entry_new ();
        gtk_widget_show (save_folder);
 
        save_folder_tip = gtk_tooltips_new();
        save_folder = gtk_entry_new ();
        gtk_widget_show (save_folder);

-       gtk_table_attach (GTK_TABLE (table), save_folder, 1, 2, 6, 7,
-                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                         (GtkAttachOptions) (0), 0, 0);
+       gtk_box_pack_start (GTK_BOX (hbox2), save_folder, FALSE, FALSE, 0);

        gtk_tooltips_set_tip(save_folder_tip, save_folder,
                             _("Leave empty to use the default trash folder"),
                             NULL);
 
        save_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
        gtk_widget_show (save_folder_select);
        gtk_tooltips_set_tip(save_folder_tip, save_folder,
                             _("Leave empty to use the default trash folder"),
                             NULL);
 
        save_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
        gtk_widget_show (save_folder_select);

-       gtk_table_attach (GTK_TABLE (table), save_folder_select, 2, 3, 6, 7,
-                         (GtkAttachOptions) (0),
-                         (GtkAttachOptions) (0), 0, 0);
+       gtk_box_pack_start (GTK_BOX (hbox2), save_folder_select, FALSE, FALSE, 0);

        gtk_tooltips_set_tip(save_folder_tip, save_folder_select,
                             _("Leave empty to use the default trash folder"),
                             NULL);
        gtk_tooltips_set_tip(save_folder_tip, save_folder_select,
                             _("Leave empty to use the default trash folder"),
                             NULL);