From: Paul Mangan <paul@claws-mail.org>
Date: Sun, 12 May 2002 06:56:28 +0000 (+0000)
Subject: sync with 0.7.5cvs20
X-Git-Tag: rel_0_7_6~19
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c33e894f45ddfbabf2c885f2f7fa6e31ec59eaa1

sync with 0.7.5cvs20
---

diff --git a/ChangeLog b/ChangeLog
index 0f4ce7e48..4eb91528d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-11
+
+	* src/prefs_account.c: turn off "receive at get all" option by default
+	  when creating an IMAP or News account.
+
 2002-05-11
 
 	* src/imap.c: imap_scan_tree(): don't use namespace for prefix.
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4aec4332a..def4f3cac 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-05-12 [paul]	0.7.5claws19
+
+	* sync with 0.7.5cvs20
+		see ChangeLog 2002-05-11
+
 2002-05-12 [alfons]	0.7.5claws18
 
 	* src/quote_fmt_lex.l
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 7817990ab..27679edae 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2002-05-11
+
+	* src/prefs_account.c: IMAP ¤Þ¤¿¤Ï News ¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ë¤È¤­¤Ë
+	  ¡ÖÁ´¼õ¿®¤Ç¼õ¿®¡×¥ª¥×¥·¥ç¥ó¤ò¥Ç¥Õ¥©¥ë¥È¤Ç¥ª¥Õ¤Ë¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2002-05-11
 
 	* src/imap.c: imap_scan_tree(): namespace ¤ò¥×¥ì¥Õ¥£¥¯¥¹¤Ë»ÈÍѤ·¤Ê¤¤
diff --git a/configure.in b/configure.in
index 70a887463..484db1834 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws18
+EXTRA_VERSION=claws19
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 97058dbae..221ef1661 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2066,6 +2066,13 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
 			(GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
 		gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
 		gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
+
+		if (!tmp_ac_prefs.account_name) {
+			gtk_toggle_button_set_active
+				(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+				 FALSE);
+		}
+
 #if USE_SSL
 		gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
 		gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
@@ -2124,6 +2131,12 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
 		prefs_account_mailcmd_toggled
 			(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
 
+		if (!tmp_ac_prefs.account_name) {
+			gtk_toggle_button_set_active
+				(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+				 TRUE);
+		}
+
 #if USE_SSL
 		gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
 		gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
@@ -2184,6 +2197,12 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
 		gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
 		gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
+		if (!tmp_ac_prefs.account_name) {
+			gtk_toggle_button_set_active
+				(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+				 FALSE);
+		}
+
 #if USE_SSL
 		gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
 		gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
@@ -2245,6 +2264,12 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
 		gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
 		gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
+		if (!tmp_ac_prefs.account_name) {
+			gtk_toggle_button_set_active
+				(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+				 TRUE);
+		}
+
 #if USE_SSL
 		gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
 		gtk_widget_set_sensitive(ssl.pop_chkbtn, TRUE);
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 471648687..33f58a8ba 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -2180,6 +2180,9 @@ static void prefs_display_create(void)
 
 	PACK_CHECK_BUTTON (vbox2, chkbtn_display_img,
 			   _("Automatically display images"));
+
+	PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
 	hbox1 = gtk_hbox_new (FALSE, 8);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);