CVS: sylpheed-claws/src prefs_receive.c,1.1.2.9,1.1.2.10

Update of /cvsroot/sylpheed-claws/sylpheed-claws/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18251/src

Modified Files:
      Tag: gtk2
	prefs_receive.c 
Log Message:
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

Index: prefs_receive.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/Attic/prefs_receive.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- prefs_receive.c	28 Apr 2006 08:58:36 -0000	1.1.2.9
+++ prefs_receive.c	29 Apr 2006 20:28:49 -0000	1.1.2.10
@@ -84,6 +84,7 @@
 	
 	GtkWidget *vbox1;
 	GtkWidget *vbox2;
+	GtkWidget *vbox3;
 	GtkWidget *checkbtn_incext;
 	GtkWidget *hbox;
 	GtkWidget *label_incext;
@@ -105,7 +106,7 @@
 	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 @@
 	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 @@
 				 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),



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642