From: Paul Mangan <paul@claws-mail.org>
Date: Sun, 9 Dec 2001 10:05:40 +0000 (+0000)
Subject: sync with sylpheed 0.6.5cvs24
X-Git-Tag: rel_0_6_6~54
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=51aca9abdb10b36fe4fe523210b8883e3be5d3b3;ds=sidebyside

sync with sylpheed 0.6.5cvs24
---

diff --git a/ChangeLog b/ChangeLog
index 4551ae039..525e9786e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-09
+
+	* src/prefs_account.c: prefs_account_apply(): fixed a bug that
+	  checked user ID on "local", but didn't on IMAP4.
+	* src/imap.c: imap_session_get(): fixed a crash bug when
+	  rfolder->session == NULL.
+	* Makefile.am: changed the arguments of tar from 'chojf' to
+	  '--bzip2 -chof'.
+	* src/summaryview.c: summary_toggle_view(): disclaim the selection
+	  of textview before removing vpaned.
+
 2001-12-08
 
 	* src/messageview.c: messageview_change_view_type(): disclaim the
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3bfaddd8a..fa8aea521 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-12-09 [paul]	0.6.5claws66
+
+	* sync with sylpheed 0.6.5cvs24
+        	see ChangeLog entry 2001-12-09
+
 2001-12-08 [alfons]	0.6.5claws65
 
 	* src/textview.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 32a3647fd..72cc8e656 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,14 @@
+2001-12-09
+
+	* src/prefs_account.c: prefs_account_apply(): ¡Ö¥í¡¼¥«¥ë¡×¤Ç
+	  ¥æ¡¼¥¶ ID ¤ò¥Á¥§¥Ã¥¯¤·¡¢ IMAP4 ¤Ç¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¥Ð¥°¤ò
+	  ½¤Àµ¡£
+	* src/imap.c: imap_session_get(): rfolder->session == NULL ¤Î¤È¤­
+	  ¤Ë¥¯¥é¥Ã¥·¥å¤¹¤ë¥Ð¥°¤ò½¤Àµ¡£
+	* Makefile.am: tar ¤Î°ú¿ô¤ò 'chojf' ¤«¤é '--bzip2 -chof' ¤ËÊѹ¹¡£
+	* src/summaryview.c: summary_toggle_view(): vpaned ¤ò remove ¤¹¤ë
+	  Á°¤Ë textview ¤Î¥»¥ì¥¯¥·¥ç¥ó¤òÊü´þ¡£
+
 2001-12-08
 
 	* src/messageview.c: messageview_change_view_type(): textview ¤ò
diff --git a/Makefile.am b/Makefile.am
index eeaf8f394..862fd7895 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,5 +30,5 @@ BZIP2_ENV =
 release: distdir
 	-chmod -R a+r $(distdir)
 	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	BZIP2=$(BZIP2_ENV) $(TAR) chojf $(distdir).tar.bz2 $(distdir)
+	BZIP2=$(BZIP2_ENV) $(TAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir)
 	-rm -rf $(distdir)
diff --git a/configure.in b/configure.in
index 541154556..8057ef6a8 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws65
+EXTRA_VERSION=claws66
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/imap.c b/src/imap.c
index d8360748e..aefabf823 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -253,11 +253,11 @@ static IMAPSession *imap_session_get(Folder *folder)
 					 folder->account->userid,
 					 folder->account->passwd);
 #endif
-		if (rfolder->session)
+		if (rfolder->session) {
 			imap_parse_namespace(IMAP_SESSION(rfolder->session),
 					     IMAP_FOLDER(folder));
-
-		rfolder->session->last_access_time = time(NULL);
+			rfolder->session->last_access_time = time(NULL);
+		}
 		statusbar_pop_all();
 		return IMAP_SESSION(rfolder->session);
 	}
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 9353b1337..e356bab6e 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1517,7 +1517,7 @@ static gint prefs_account_apply(void)
 		alertpanel_error(_("SMTP server is not entered."));
 		return -1;
 	}
-	if ((protocol == A_POP3 || protocol == A_APOP || protocol == A_LOCAL) &&
+	if ((protocol == A_POP3 || protocol == A_APOP || protocol == A_IMAP4) &&
 	    *gtk_entry_get_text(GTK_ENTRY(basic.uid_entry)) == '\0') {
 		alertpanel_error(_("User ID is not entered."));
 		return -1;
diff --git a/src/summaryview.c b/src/summaryview.c
index 4202a60b3..8fcde9d5e 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2361,6 +2361,9 @@ static void summary_toggle_view(SummaryView *summaryview)
 		summaryview->msg_is_toggled_on = FALSE;
 		summaryview->displayed = NULL;
 		gtk_widget_ref(vpaned);
+		gtk_editable_claim_selection
+			(GTK_EDITABLE(summaryview->messageview->textview->text),
+			 FALSE, GDK_CURRENT_TIME);
 		gtk_container_remove(GTK_CONTAINER(container), vpaned);
 		gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
 		gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),