sync with sylpheed 0.7.0 release

diff --git a/ChangeLog b/ChangeLog
index e78b9607aceea1cc342d7122ef7f55005bc69e8d..99b32b4500f027e8b95309ce387000901af5f70d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2002-01-09
+
+       * README
+         README.jp
+         src/about.c: modified the copyright year.
+       * src/gtkstext.h: added the notice for modification by the Sylpheed
+         Team.
+
+2002-01-08
+
+       * INSTALL
+         INSTALL.jp: added the URL for compface.
+
+2002-01-07
+
+       * version 0.7.0
+
+2002-01-07
+
+       * src/headerwindow.c
+         src/logwindow.c
+         src/messageview.c
+         src/sourcewindow.c: set wmclass when creating windows.
+
 2002-01-04
 
        * src/compose.c: compose_wrap_line_all(): fixed the bug that

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5deb3c7dccdedc7fed588c6a001fd029e324bb26..87195fed8cf29792bc2ffe86ede9ec316b32315e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,14 +1,20 @@
-2001-01-09 [alfons]
+2002-01-10 [paul]      0.6.6claws46
+
+       * sync with sylpheed 0.7.0 release
+               see ChangeLog entries 2002-01-07, 2002-01-08 and
+               2002-01-09
+
+2002-01-09 [alfons]
 
        * src/summaryview.c
                remove more dirt traces...
 
-2001-01-09 [alfons]
+2002-01-09 [alfons]
        
        * src/summaryview.c
                clean up some traces of my debugging stuff
 
-2001-01-09 [alfons]    0.6.6claws45
+2002-01-09 [alfons]    0.6.6claws45
 
        * src/filtering.c
                break up filteringprop_apply() in three separate pieces

diff --git a/ChangeLog.jp b/ChangeLog.jp
index b328874e5eebdde3aba73a0257c0c049abf522e8..ef620d24bbcec908dd9740ce2fa7cac3276bd0bf 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,27 @@
+2002-01-09
+
+       * README
+         README.jp
+         src/about.c: copyright ¤Îǯ¤ò½¤Àµ¡£
+       * src/gtkstext.h: Sylpheed ¥Á¡¼¥à¤Ë¤è¤ë½¤Àµ¤Îɽ¼¨¤òÄɲá£
+
+2002-01-08
+
+       * INSTALL
+         INSTALL.jp: compface ¤Î URL ¤òÄɲá£
+
+2002-01-07
+
+       * version 0.7.0
+
+2002-01-07
+
+       * src/headerwindow.c
+         src/logwindow.c
+         src/messageview.c
+         src/sourcewindow.c: ¥¦¥£¥ó¥É¥¦¤òÀ¸À®¤¹¤ë¤È¤­¤Ë wmclass ¤ò¥»¥Ã¥È
+         ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2002-01-04
 
        * src/compose.c: compose_wrap_line_all(): ÆÃÄê¤Î¥Ñ¥¿¡¼¥ó¤Î°úÍÑʸ

diff --git a/INSTALL b/INSTALL
index dae82b206d9a94217211cbb660cb418685e55ac1..199671383ba2fcf1496840321d66828b45381f49 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -98,6 +98,7 @@ o Solaris 2.6
 o Solaris 7
 o Solaris 8
 o IRIX 6.3
+o IRIX 6.4
 o IRIX 6.5 6.5.8m
 o HP-UX 10.20
 o HP-UX 11.0
@@ -110,6 +111,8 @@ Others
 
 o Windows (cygwin + GTK+ for win32) (unstable)
 
+Build it
+========
 
 For installation, just type:
 
@@ -119,9 +122,22 @@ For installation, just type:
 Password: [Enter password]
 # make install
 
+Additional libraries
+====================
+
 I recommend you to install gdk-pixbuf or gdk_imlib library before installing
-for built-in image view support, and libcompface for X-Face support.
+for built-in image view support, and compface library for X-Face support.
+
+You can get compface utilities and library from the following location:
+
+  http://freshmeat.net/projects/compface/
+
+Sylpheed supports US-ASCII, ISO-8859-1, and EUC-JP by default.
+If you want other character set / encoding (such as UTF-8, KOI8-R, and GB2312)
+to be supported, you have to install libjconv, which is a wrapper for
+iconv(). You can obtain it from the following location:
 
+  http://www.kondara.org/libjconv/index.html
 
 If you want to enable SSL support, append the option
 --enable-ssl after ./configure (you need OpenSSL).
@@ -133,7 +149,7 @@ If you want to enable GnuPG support, you need GPGME 0.2.3 or later, and
 GnuPG 1.0.6 or later. You can get them from the following location:
 
   ftp://ftp.gnupg.org/pub/gcrypt/alpha/gpgme/
-  ftp://ftp.gnupg.org/pub/gcrypt/devel/
+  ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
 
 and append the option --enable-gpgme after ./configure.
 

diff --git a/INSTALL.jp b/INSTALL.jp
index eef41d4ad76246d77f610d70c940fb6160baca7f..c9076787107b6e838524e562512de73aa7083857 100644 (file)
--- a/INSTALL.jp
+++ b/INSTALL.jp
@@ -97,6 +97,7 @@ o Solaris 2.6
 o Solaris 7
 o Solaris 8
 o IRIX 6.3
+o IRIX 6.4
 o IRIX 6.5 6.5.8m
 o HP-UX 10.20
 o HP-UX 11.0
@@ -109,6 +110,8 @@ o Mac OS X (Darwin 1.3) + Xtools (locale 
 
 o Windows (cygwin + GTK+ for win32) (unstable)
 
+¥Ó¥ë¥É
+======
 
 ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:
 
@@ -118,10 +121,23 @@ o Windows (cygwin + GTK+ for win32) (unstable)
 Password: [¥Ñ¥¹¥ï¡¼¥É¤òÆþÎÏ]
 # make install
 
+Äɲå饤¥Ö¥é¥ê
+==============
+
 ¥¤¥ó¥¹¥È¡¼¥ëÁ°¤Ë¡¢¥Ó¥ë¥È¥¤¥ó²èÁüɽ¼¨Âбþ¤Î¤¿¤á¤Ë gdk-pixbuf ¤Þ¤¿¤Ï gdk_imlib
-¥é¥¤¥Ö¥é¥ê¡¢¤½¤·¤Æ X-Face Âбþ¤Î¤¿¤á¤Ë libcompface ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤¯
-¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£
+¥é¥¤¥Ö¥é¥ê¡¢¤½¤·¤Æ X-Face Âбþ¤Î¤¿¤á¤Ë compface ¥é¥¤¥Ö¥é¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ
+¤ª¤¯¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£
+
+compface ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤È¥é¥¤¥Ö¥é¥ê¤Ï°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹:
+
+  http://freshmeat.net/projects/compface/
+
+Sylpheed ¤Ïɸ½à¤Ç US-ASCII, ISO-8859-1, EUC-JP ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+¾¤Îʸ»ú½¸¹ç / Éä¹æ²½Êý¼°(Î㤨¤Ð UTF-8, KOI8-R, GB2312 Åù)
+¤ËÂбþ¤µ¤»¤¿¤¤¾ì¹ç¤Ï¡¢ libjconv (iconv() ¤Î¥é¥Ã¥Ñ¡¼) ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë
+ɬÍפ¬¤¢¤ê¤Þ¤¹¡£ libjconv ¤Ï°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹:
 
+  http://www.kondara.org/libjconv/index.html
 
 SSL Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ ./configure ¤Î¸å¤Ë
 --enable-ssl ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤(OpenSSL ¤¬É¬ÍפǤ¹)¡£
@@ -133,9 +149,9 @@ GnuPG 
 ɬÍפǤ¹¡£°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹:
 
   ftp://ftp.gnupg.org/pub/gcrypt/alpha/gpgme/
-  ftp://ftp.gnupg.org/pub/gcrypt/devel/
+  ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
 
-¤½¤·¤Æ¡¢ ./configure ¤Î¸å¤Ë --enable-gpgme ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
+./configure ¤Î¸å¤Ë --enable-gpgme ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
 
 ·Ù¹ð: GnuPG Âбþ¤Ï¤Þ¤À³«È¯ÅÓ¾å¤ÎÃʳ¬¤Ç¤¢¤ê¡¢Àµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£
       ·è¤·¤ÆËÜÅö¤Î¸°¤ò»È¤ï¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£¥µ¥ó¥×¥ë¤Î¸°¤ò¤ª»È¤¤¤¯¤À

diff --git a/README b/README
index d526c5610d4b0c13935ab1add4e533d3ce841d8a..68d72e7d7ebe40c1011b1859b23e76755bad6823 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
        Sylpheed - a GTK+ based, lightweight, and fast e-mail client
 
-   Copyright(C) 1999-2001 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
+   Copyright(C) 1999-2002 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/README.jp b/README.jp
index e34c18fb60b467ffee8a1e0bed20fc2971388942..571c6cd89cf3a54e5ef01b3cf18830e5fa0a7655 100644 (file)
--- a/README.jp
+++ b/README.jp
@@ -1,6 +1,6 @@
        Sylpheed - GTK+ ¥Ù¡¼¥¹¤Î·ÚÎ̤ǹ⮤ÊÅŻҥ᡼¥ë¥¯¥é¥¤¥¢¥ó¥È
 
-   Copyright(C) 1999-2001 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
+   Copyright(C) 1999-2002 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/configure.in b/configure.in
index bb4e0f0f677f150bc41a22bdf6b928cebf55fc91..099ad945d08dd028d2db75427db484f4052862a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws45
+EXTRA_VERSION=claws46
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/about.c b/src/about.c
index cede677b6d008f541e7218935f9f3f94e0f513c4..703590899b41bdbbd1bb49950e5b455f8948d47b 100644 (file)
--- a/src/about.c
+++ b/src/about.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -161,7 +161,7 @@ static void about_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        label = gtk_label_new
-               ("Copyright (C) 1999-2001 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>");
+               ("Copyright (C) 1999-2002 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        hbox = gtk_hbox_new(FALSE, 0);

diff --git a/src/gtkstext.h b/src/gtkstext.h
index f2e9676f1b0a5f7e1e01369a52c1c94e6abf5d6d..6c4c2ec391184fab63081be6571901abaeaa6b70 100644 (file)
--- a/src/gtkstext.h
+++ b/src/gtkstext.h
@@ -24,6 +24,10 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+/*
+ * Modified by the Sylpheed Team and others 2001-2002.
+ */
+
 #ifndef __GTK_STEXT_H__
 #define __GTK_STEXT_H__