sync with 0.7.4cvs4

diff --git a/ChangeLog b/ChangeLog
index 742f0da45be3f24322a6a84373320363b69f6dd2..13f5c0902eb7eab7d3c6504ac1819e8a3ce59461 100644 (file)
--- 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
 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 fc45250760f06209ed117dcede369552e9b9a00a..df70c4bd3bc9debea3663bf2caf4534a7e9bc746 100644 (file)
--- 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
 2002-04-28 [paul]      0.7.5claws
 
        * po/es.po

diff --git a/ChangeLog.jp b/ChangeLog.jp
index a2b8ffd8a560688b4547d3ee1d55541b9ce5bc3b..b7d6a50064e790f227831271cff4450ed5656d59 100644 (file)
--- 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 ¥Õ¥©¥ë¥À¤Ë¥×¥ì
 2002-04-23
 
        * src/imap.c: imap_create_folder(): root ¤Î INBOX ¥Õ¥©¥ë¥À¤Ë¥×¥ì


@@ -12,7 +19,7 @@
 
 2002-04-21
 
 
 2002-04-21
 

-       * sylpheed*.png: ¼ã°æ¤µ¤ó¤Ë¤è¤ë¿·¤·¤¤ app ¥¢¥¤¥³¥ó¤òÄɲÃ(thanks!)¡£
+       * sylpheed*.png: ¼ãµï¤µ¤ó¤Ë¤è¤ë¿·¤·¤¤ app ¥¢¥¤¥³¥ó¤òÄɲÃ(thanks!)¡£

 
 2002-04-21
 
 
 2002-04-21
 

diff --git a/configure.in b/configure.in
index 90cea8e09ae9ba1e918a97db69afe26dcf756171..4dcec01be1571680afdcdf03886c0cbd5a7ad210 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target