2006-04-29 [colin] 2.1.1cvs43

	* src/prefs_receive.c
	* src/plugins/spamassassin/spamassassin_gtk.c
	* src/plugins/clamav/clamav_plugin_gtk.c
		GUI fixes by Pawel

diff --git a/ChangeLog b/ChangeLog
index e3d1c013b330a8bc170e3e0bdc0c202909092bf4..01aaa5549475ab143fb454521d727be07eb7cd37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-29 [colin]     2.1.1cvs43
+
+       * src/prefs_receive.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+       * src/plugins/clamav/clamav_plugin_gtk.c
+               GUI fixes by Pawel
+
 2006-04-29 [colin]     2.1.1cvs42
 
        * src/prefs_compose_writing.c

diff --git a/PATCHSETS b/PATCHSETS
index 82980ff05e0f812394ad8a04bfa874c29cd08666..f26e8bb74e25f274b2ef6a84ae42d5b010684e34 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1464,3 +1464,4 @@
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_message.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_receive.c;  ) > 2.1.1cvs40.patchset
 ( cvs diff -u -r 1.75.2.20 -r 1.75.2.21 src/matcher.c;  ) > 2.1.1cvs41.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_quote.c;  ) > 2.1.1cvs42.patchset
+( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_receive.c;  cvs diff -u -r 1.23.2.28 -r 1.23.2.29 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/plugins/clamav/clamav_plugin_gtk.c;  ) > 2.1.1cvs43.patchset

diff --git a/configure.ac b/configure.ac
index e6f88f2af33cdbcbe32f29387a33eb0736f45842..026e73b34df5e680c2759c17dc21638799be9002 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index 3d49a67a4eb8e3ec3922aed7971f9e684dea0ff1..2e20865bb952fbc0904b13eef870723153b932cb 100644 (file)
--- a/src/plugins/clamav/clamav_plugin_gtk.c
+++ b/src/plugins/clamav/clamav_plugin_gtk.c
@@ -155,7 +155,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 
        config = clamav_get_config();
 
-       g_signal_connect(G_OBJECT(save_folder_select), "released", 
+       g_signal_connect(G_OBJECT(save_folder_select), "clicked", 
                         G_CALLBACK(foldersel_cb), page);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_clamav), config->clamav_enable);

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 1f17b79717f36f04922b1119b3dc288a549c3280..dc8fe0882fd4dda001e3ab79de59e6b33b32add9 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -401,7 +401,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);

diff --git a/src/prefs_receive.c b/src/prefs_receive.c
index 184caf00a771e966bfd6c5528a3b8e7045099d9a..e8ad96c96191d596c5c7466f5b0b78e3fc5caf67 100644 (file)
--- a/src/prefs_receive.c
+++ b/src/prefs_receive.c
@@ -84,6 +84,7 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
        
        GtkWidget *vbox1;
        GtkWidget *vbox2;
+       GtkWidget *vbox3;
        GtkWidget *checkbtn_incext;
        GtkWidget *hbox;
        GtkWidget *label_incext;
@@ -105,7 +106,7 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_newmail_manu;
        GtkWidget *entry_newmail_notify_cmd;
        GtkWidget *label_newmail_notify_cmd;
-
+       
        GtkWidget *label_recvdialog;
        GtkWidget *menu;
        GtkWidget *menuitem;
@@ -212,24 +213,33 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
                           _("Don't popup error dialog on receive error"));
 
-       PACK_FRAME(vbox1, frame, _("Run command when new mail "
-                                          "arrives"));
+       PACK_FRAME(vbox1, frame, _("After receiving new mail"));
        vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
        gtk_widget_show (vbox2);
        gtk_container_add (GTK_CONTAINER (frame), vbox2);
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
+       PACK_CHECK_BUTTON (vbox2, checkbtn_openinbox, _("Go to inbox"));
+       PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
+                          _("Update all local folders"));
+ 
+       PACK_FRAME(vbox2, frame, _("Run command"));
+       vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox3);
+       gtk_container_add (GTK_CONTAINER (frame), vbox3);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 4);
+       
        hbox = gtk_hbox_new (TRUE, 8);
        gtk_widget_show (hbox);
        PACK_CHECK_BUTTON (hbox, checkbtn_newmail_auto,
                           _("after automatic check"));
        PACK_CHECK_BUTTON (hbox, checkbtn_newmail_manu,
                           _("after manual check"));
-       gtk_box_pack_start (GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX(vbox3), hbox, FALSE, FALSE, 0);
 
        hbox_newmail_notify = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox_newmail_notify);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox_newmail_notify, FALSE, 
+       gtk_box_pack_start (GTK_BOX (vbox3), hbox_newmail_notify, FALSE, 
                            FALSE, 0);
 
        label_newmail_notify_cmd = gtk_label_new (_("Command to execute:\n"
@@ -250,15 +260,6 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
                                 prefs_common.newmail_notify_auto || 
                                 prefs_common.newmail_notify_manu);
 
-       vbox2 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox2);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_openinbox,
-                          _("Go to inbox after receiving new mail"));
-       PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
-                          _("Update all local folders after receiving mail"));
-                          
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_incext),
                prefs_common.use_extinc);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_no_recv_err_panel),