From: Paul Mangan <paul@claws-mail.org>
Date: Sun, 28 Apr 2002 10:36:31 +0000 (+0000)
Subject: sync with 0.7.4cvs4
X-Git-Tag: w32-075claws17-0~20
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=46c008c2d4ed557fc29d6fd5e5b1f495c20c8911

sync with 0.7.4cvs4
---

diff --git a/ChangeLog b/ChangeLog
index 742f0da45..13f5c0902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-25
+
+	* src/utils.[ch]: trim_string(): new. It trim characters longer than
+	  the specified length and adds "...".
+	* src/folderview.c: trim folder name when displaying dialog.
+
 2002-04-23
 
 	* src/imap.c: imap_create_folder(): don't add prefix for root INBOX
diff --git a/ChangeLog.claws b/ChangeLog.claws
index fc4525076..df70c4bd3 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-04-28 [paul]	0.7.5claws1
+
+	* sync with 0.7.5cvs4
+		see ChangeLog entry  2002-04-25
+
 2002-04-28 [paul]	0.7.5claws
 
 	* po/es.po
diff --git a/ChangeLog.jp b/ChangeLog.jp
index a2b8ffd8a..b7d6a5006 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2002-04-25
+
+	* src/utils.[ch]: trim_string(): ¿·µ¬¡£»ØÄꤷ¤¿Ä¹¤µ¤è¤êŤ¤Ê¸»ú¤ò
+	  ÀÚ¤êµÍ¤á¡¢ "..." ¤òÄɲ乤롣
+	* src/folderview.c: ¥À¥¤¥¢¥í¥°¤òɽ¼¨¤¹¤ë¤È¤­¥Õ¥©¥ë¥À̾¤òÀÚ¤êµÍ¤á¤ë
+	  ¤è¤¦¤Ë¤·¤¿¡£
+
 2002-04-23
 
 	* src/imap.c: imap_create_folder(): root ¤Î INBOX ¥Õ¥©¥ë¥À¤Ë¥×¥ì
@@ -12,7 +19,7 @@
 
 2002-04-21
 
-	* sylpheed*.png: ¼ã°æ¤µ¤ó¤Ë¤è¤ë¿·¤·¤¤ app ¥¢¥¤¥³¥ó¤òÄɲÃ(thanks!)¡£
+	* sylpheed*.png: ¼ãµï¤µ¤ó¤Ë¤è¤ë¿·¤·¤¤ app ¥¢¥¤¥³¥ó¤òÄɲÃ(thanks!)¡£
 
 2002-04-21
 
diff --git a/configure.in b/configure.in
index 90cea8e09..4dcec01be 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=claws
+EXTRA_VERSION=claws1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target