From: Paul Mangan <paul@claws-mail.org>
Date: Sun, 21 Apr 2002 09:51:33 +0000 (+0000)
Subject: sync with 0.7.4cvs51
X-Git-Tag: rel_0_7_5~32
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=cb1bb1b759ef6c0978adb8475e294780e5b63cf2

sync with 0.7.4cvs51
---

diff --git a/ChangeLog b/ChangeLog
index 0e2ab4b9a..7b1b5b04d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-21
+
+	* src/summaryview.c: summary_show(): fixed a bug that didn't process
+	  the left marks.
+	* src/account.c: account_edit_prefs(): fixed a crash bug when account
+	  name was empty.
+	* src/prefs_account.c: prefs_account_apply(): display error dialog
+	  if account name is empty.
+
 2002-04-21
 
 	* src/mh.c: mh_get_new_msg_filename(): new. It returns the filename
diff --git a/ChangeLog.claws b/ChangeLog.claws
index f8358c0ca..13ef25eab 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-04-21 [paul]	0.7.4claws86
+
+	* sync with 0.7.4cvs51
+		see ChangeLog entry 2002-04-21
+
 2002-04-21 [paul]	0.7.4claws85
 
 	* sync with 0.7.4cvs49
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 24f032a95..1e3852740 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,12 @@
+2002-04-21
+
+	* src/summaryview.c: summary_show(): »Ä¤Ã¤¿¥Þ¡¼¥¯¤ò½èÍý¤·¤Ê¤¤¥Ð¥°¤ò
+	  ½¤Àµ¡£
+	* src/account.c: account_edit_prefs(): ¥¢¥«¥¦¥ó¥È̾¤¬¶õ¤Î¾ì¹ç¤Î
+	  ¥¯¥é¥Ã¥·¥å¥Ð¥°¤ò½¤Àµ¡£
+	* src/prefs_account.c: prefs_account_apply(): ¥¢¥«¥¦¥ó¥È̾¤¬¶õ¤Î¾ì¹ç
+	  ¥¨¥é¡¼¥À¥¤¥¢¥í¥°¤òɽ¼¨¡£
+
 2002-04-21
 
 	* src/mh.c: mh_get_new_msg_filename(): ¿·µ¬¡£¿·µ¬¥á¥Ã¥»¡¼¥¸¤Î¥Õ¥¡¥¤¥ë
diff --git a/configure.in b/configure.in
index 69da0eb1b..80a0939dd 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws85
+EXTRA_VERSION=claws86
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/account.c b/src/account.c
index f6b53a347..52066bac7 100644
--- a/src/account.c
+++ b/src/account.c
@@ -606,7 +606,8 @@ static void account_edit_prefs(void)
 	row = GPOINTER_TO_INT(clist->selection->data);
 	ac_prefs = gtk_clist_get_row_data(clist, row);
 	prev_default = ac_prefs->is_default;
-	Xstrdup_a(ac_name, ac_prefs->account_name, return);
+	Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
+		  return);
 
 	prefs_account_open(ac_prefs);
 
@@ -614,7 +615,7 @@ static void account_edit_prefs(void)
 		account_set_as_default(ac_prefs);
 
 	if ((ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) &&
-	    ac_prefs->folder && strcmp(ac_name, ac_prefs->account_name) != 0) {
+	    ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
 		folder_set_name(FOLDER(ac_prefs->folder),
 				ac_prefs->account_name);
 		folderview_rescan_all();
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 84e62016f..97058dbae 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1838,6 +1838,10 @@ static gint prefs_account_apply(void)
 	protocol = GPOINTER_TO_INT
 		(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
 
+	if (*gtk_entry_get_text(GTK_ENTRY(basic.acname_entry)) == '\0') {
+		alertpanel_error(_("Account name is not entered."));
+		return -1;
+	}
 	if (*gtk_entry_get_text(GTK_ENTRY(basic.addr_entry)) == '\0') {
 		alertpanel_error(_("Mail address is not entered."));
 		return -1;
diff --git a/src/summaryview.c b/src/summaryview.c
index a57656abb..212a9742c 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -719,9 +719,11 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 		val = alertpanel(_("Process mark"),
 				 _("Some marks are left. Process it?"),
 				 _("Yes"), _("No"), _("Cancel"));
-		if (G_ALERTDEFAULT == val)
+		if (G_ALERTDEFAULT == val) {
+			summary_unlock(summaryview);
 			summary_execute(summaryview);
-		else if (G_ALERTALTERNATE == val)
+			summary_lock(summaryview);
+		} else if (G_ALERTALTERNATE == val)
 			summary_write_cache(summaryview);
 		else {
 			summary_unlock(summaryview);