sync with sylpheed 0.7.4

diff --git a/ChangeLog b/ChangeLog
index 42f083a..4b4a14c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2002-03-09
+
+       * version 0.7.4
+
+2002-03-09
+
+       * src/ssl.[ch]: match its coding style.
+       * src/compose.c: compose_send_later_cb(): fixed a bug that failed
+         to save file.
+       * faq/Makefile.am
+         faq/en/Makefile.am
+         faq/en/sylpheed-faq*.html
+         faq/es/Makefile.am
+         faq/es/sylpheed-faq*.html
+         faq/fr/Makefile.am
+         faq/fr/sylpheed-faq*.html
+         configure.in
+         Makefile.am
+         src/Makefile.am
+         src/defs.h
+         src/mainwindow.c
+         src/manual.[ch]: added FAQs in English, Spanish and French.
+
 2002-03-07
 
        * manual/en/sylpheed*.html: updated to the latest version.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 06f5ba8..2d0af36 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-03-09 [paul]      0.7.3claws3
+
+       * sync with sylpheed 0.7.4
+               see ChangeLog entry 2002-03-09
+
 2002-03-08 [paul]      0.7.3claws2
 
        * faq/en/sylpheed-faq*

diff --git a/ChangeLog.jp b/ChangeLog.jp
index b19f271..7d81676 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,26 @@
+2002-03-09
+
+       * version 0.7.4
+
+2002-03-09
+
+       * src/ssl.[ch]: ¥³¡¼¥Ç¥£¥ó¥°¥¹¥¿¥¤¥ë¤ò¹ç¤ï¤»¤¿¡£
+       * src/compose.c: compose_send_later_cb(): ¥Õ¥¡¥¤¥ë¤ÎÊݸ¤Ë¼ºÇÔ¤¹¤ë
+         ¥Ð¥°¤ò½¤Àµ¡£
+       * faq/Makefile.am
+         faq/en/Makefile.am
+         faq/en/sylpheed-faq*.html
+         faq/es/Makefile.am
+         faq/es/sylpheed-faq*.html
+         faq/fr/Makefile.am
+         faq/fr/sylpheed-faq*.html
+         configure.in
+         Makefile.am
+         src/Makefile.am
+         src/defs.h
+         src/mainwindow.c
+         src/manual.[ch]: ±Ñ¸ì¡¢¥¹¥Ú¥¤¥ó¸ì¡¢¥Õ¥é¥ó¥¹¸ì¤Î FAQ ¤òÄɲá£
+
 2002-03-07
 
        * manual/en/sylpheed*.html: ºÇ¿·ÈǤ˹¹¿·¡£

diff --git a/Makefile.am b/Makefile.am
index 51ef26b..5c46e63 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = ac faq po intl libkcc src manual tools
+SUBDIRS = ac po intl libkcc src manual faq tools
 
 EXTRA_DIST = \
        ChangeLog.jp \

diff --git a/NEWS b/NEWS
index 3fd280d..9874f88 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,15 @@
 Changes of Sylpheed
 
+* 0.7.4
+
+    * The bug that lost UIDL information if any error occured before issuing
+      UIDL command was fixed.
+    * Message retrieving is now cancelable from the menu even if the dialog
+      is hidden.
+    * Some warnings on compiling with gcc-3.0 have been removed.
+    * The English manual has been updated.
+    * The FAQs in English, Spanish and French have been added.
+
 * 0.7.3
 
     * Attached files will be inherited on forwarding or reediting.

diff --git a/configure.in b/configure.in
index ba1e101..2a32398 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -78,7 +78,6 @@ AC_SUBST(localedir)
 
 manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
 AC_SUBST(manualdir)
-
 faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
 AC_SUBST(faqdir)
 
@@ -134,35 +133,6 @@ else
        AC_MSG_RESULT(no)
 fi
 
-dnl Check for OpenSSL
-AC_ARG_ENABLE(ssl,
-       [  --enable-ssl            Enable SSL support using OpenSSL [default=no]],
-       [ac_cv_enable_ssl=$enableval], [ac_cv_enable_ssl=no])
-AC_MSG_CHECKING([whether to use OpenSSL])
-if test $ac_cv_enable_ssl = yes; then
-       AC_MSG_RESULT(yes)
-       AC_MSG_CHECKING([if openssl is available])
-       LIBS="$LIBS -lssl -lcrypto"
-       AC_TRY_LINK([
-#include <openssl/opensslv.h>
-],     [ return OPENSSL_VERSION_NUMBER; ],
-       [ AC_MSG_RESULT(yes)
-         AC_DEFINE(USE_SSL) ],
-       [ AC_MSG_RESULT(no)
-         LIBS="$ac_save_LIBS"
-         ac_cv_enable_ssl=no ])
-else
-       AC_MSG_RESULT(no)
-fi
-
-dnl Check for X-Face support
-AC_ARG_ENABLE(compface,
-       [  --disable-compface      Do not use compface (X-Face)],
-       [ac_cv_enable_compface=$enableval], [ac_cv_enable_compface=yes])
-if test "$ac_cv_enable_compface" = yes; then
-       AC_CHECK_LIB(compface, uncompface,,[ac_cv_enable_compface=no])
-fi
-
 dnl for JPilot support in addressbook
 dnl no check for libraries; these are dynamically loaded
 AC_ARG_ENABLE(jpilot,
@@ -211,6 +181,35 @@ else
        AC_MSG_RESULT(no)
 fi
 
+dnl Check for OpenSSL
+AC_ARG_ENABLE(ssl,
+       [  --enable-ssl            Enable SSL support using OpenSSL [default=no]],
+       [ac_cv_enable_ssl=$enableval], [ac_cv_enable_ssl=no])
+AC_MSG_CHECKING([whether to use OpenSSL])
+if test $ac_cv_enable_ssl = yes; then
+       AC_MSG_RESULT(yes)
+       AC_MSG_CHECKING([if openssl is available])
+       LIBS="$LIBS -lssl -lcrypto"
+       AC_TRY_LINK([
+#include <openssl/opensslv.h>
+],     [ return OPENSSL_VERSION_NUMBER; ],
+       [ AC_MSG_RESULT(yes)
+         AC_DEFINE(USE_SSL) ],
+       [ AC_MSG_RESULT(no)
+         LIBS="$ac_save_LIBS"
+         ac_cv_enable_ssl=no ])
+else
+       AC_MSG_RESULT(no)
+fi
+
+dnl Check for X-Face support
+AC_ARG_ENABLE(compface,
+       [  --disable-compface      Do not use compface (X-Face)],
+       [ac_cv_enable_compface=$enableval], [ac_cv_enable_compface=yes])
+if test "$ac_cv_enable_compface" = yes; then
+       AC_CHECK_LIB(compface, uncompface,,[ac_cv_enable_compface=no])
+fi
+
 dnl Check for libjconv
 AC_ARG_ENABLE(jconv,
        [  --disable-jconv         Do not use libjconv],
@@ -366,16 +365,21 @@ dnl Output the configuration summary
 echo ""
 echo "$PACKAGE $VERSION"
 echo ""
-echo "gdk-pixbuf : $ac_cv_enable_gdk_pixbuf"
-echo "gdk_imlib  : $ac_cv_enable_imlib"
-echo "GPGME      : $ac_cv_enable_gpgme"
-echo "JPilot     : $ac_cv_enable_jpilot"
-echo "LDAP       : $ac_cv_enable_ldap"
-echo "OpenSSL    : $ac_cv_enable_ssl"
-echo "compface   : $ac_cv_enable_compface"
-echo "libjconv   : $ac_cv_enable_jconv"
-echo "IPv6       : $ac_cv_enable_ipv6"
-echo "Pspell     : $ac_cv_enable_pspell"
+if test "$ac_cv_enable_gdk_pixbuf" = yes; then
+       echo "image support : yes (gdk-pixbuf)"
+elif test "$ac_cv_enable_imlib" = yes; then
+       echo "image support : yes (gdk_imlib)"
+else
+       echo "image support : no"
+fi
+echo "GPGME         : $ac_cv_enable_gpgme"
+echo "JPilot        : $ac_cv_enable_jpilot"
+echo "LDAP          : $ac_cv_enable_ldap"
+echo "OpenSSL       : $ac_cv_enable_ssl"
+echo "compface      : $ac_cv_enable_compface"
+echo "libjconv      : $ac_cv_enable_jconv"
+echo "IPv6          : $ac_cv_enable_ipv6"
+echo "Pspell        : $ac_cv_enable_pspell"
 echo ""
 echo "The binary will be installed in $prefix/bin"
 echo ""

diff --git a/src/mainwindow.c b/src/mainwindow.c
index bbd9a87..9e2fd0b 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -435,8 +435,7 @@ static void account_menu_cb  (GtkMenuItem   *menuitem,
 static void manual_open_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
-static void faq_open_cb                (MainWindow     *mainwin,
+static void faq_open_cb                 (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
@@ -714,9 +713,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Help/_Manual/_French"),          NULL, manual_open_cb, MANUAL_LANG_FR, NULL},
        {N_("/_Help/_Manual/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
        {N_("/_Help/_FAQ"),                     NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_FAQ/_English"),            NULL, faq_open_cb, FAQ_LANG_EN, NULL},
-       {N_("/_Help/_FAQ/_Spanish"),            NULL, faq_open_cb, FAQ_LANG_ES, NULL},
-       {N_("/_Help/_FAQ/_French"),             NULL, faq_open_cb, FAQ_LANG_FR, NULL},
+       {N_("/_Help/_FAQ/_English"),            NULL, faq_open_cb, MANUAL_LANG_EN, NULL},
+       {N_("/_Help/_FAQ/_Spanish"),            NULL, faq_open_cb, MANUAL_LANG_ES, NULL},
+       {N_("/_Help/_FAQ/_French"),             NULL, faq_open_cb, MANUAL_LANG_FR, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
@@ -2979,10 +2978,9 @@ static void manual_open_cb(MainWindow *mainwin, guint action,
        manual_open((ManualLang)action);
 }
 
-static void faq_open_cb(MainWindow *mainwin, guint action,
-                       GtkWidget *widget)
+static void faq_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       faq_open((FaqLang)action);
+       faq_open((ManualLang)action);
 }
 
 static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)

diff --git a/src/manual.c b/src/manual.c
index 8313c9a..c32076b 100644 (file)
--- a/src/manual.c
+++ b/src/manual.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 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
@@ -30,24 +30,31 @@
 #include "manual.h"
 #include "utils.h"
 
-void manual_open(ManualLang lang)
-{
-       gchar *lang_str;
-       gchar *file_uri;
+static gchar *get_lang_str(ManualLang lang);
 
+static gchar *get_lang_str(ManualLang lang)
+{
        switch (lang) {
        case MANUAL_LANG_EN:
-               lang_str = "en";
-               break;
+               return "en";
+       case MANUAL_LANG_ES:
+               return "es";
        case MANUAL_LANG_FR:
-               lang_str = "fr";
-               break;
+               return "fr";
        case MANUAL_LANG_JA:
-               lang_str = "ja";
-               break;
+               return "ja";
        default:
-               return;
+               return NULL;
        }
+}
+
+void manual_open(ManualLang lang)
+{
+       gchar *lang_str;
+       gchar *file_uri;
+
+       lang_str = get_lang_str(lang);
+       if (!lang_str) return;
 
        file_uri = g_strconcat("file://", MANUALDIR,
                               G_DIR_SEPARATOR_S, lang_str, G_DIR_SEPARATOR_S,
@@ -57,24 +64,13 @@ void manual_open(ManualLang lang)
        g_free(file_uri);
 }
 
-void faq_open(FaqLang lang)
+void faq_open(ManualLang lang)
 {
        gchar *lang_str;
        gchar *file_uri;
 
-       switch (lang) {
-       case FAQ_LANG_EN:
-               lang_str = "en";
-               break;
-       case FAQ_LANG_ES:
-               lang_str = "es";
-               break;
-       case FAQ_LANG_FR:
-               lang_str = "fr";
-               break;
-       default:
-               return;
-       }
+       lang_str = get_lang_str(lang);
+       if (!lang_str) return;
 
        file_uri = g_strconcat("file://", FAQDIR,
                               G_DIR_SEPARATOR_S, lang_str, G_DIR_SEPARATOR_S,

diff --git a/src/manual.h b/src/manual.h
index f92c5bf..85cff97 100644 (file)
--- a/src/manual.h
+++ b/src/manual.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 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
@@ -23,18 +23,12 @@
 typedef enum
 {
        MANUAL_LANG_EN,
+       MANUAL_LANG_ES,
        MANUAL_LANG_FR,
        MANUAL_LANG_JA,
 } ManualLang;
 
-typedef enum
-{
-       FAQ_LANG_EN,
-       FAQ_LANG_ES,
-       FAQ_LANG_FR,
-} FaqLang;
-
 void manual_open(ManualLang lang);
-void faq_open(FaqLang lang);
+void faq_open  (ManualLang lang);
 
 #endif /* __MANUAL_H__ */

diff --git a/src/ssl.c b/src/ssl.c
index 6ec7051..aac1035 100644 (file)
--- a/src/ssl.c
+++ b/src/ssl.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
@@ -47,7 +47,7 @@ void ssl_init(void)
        }
 
        ssl_ctx_TLSv1 = SSL_CTX_new(TLSv1_client_method());
-        if (ssl_ctx_TLSv1 == NULL) {
+       if (ssl_ctx_TLSv1 == NULL) {
                debug_print(_("TLSv1 not available\n"));
        } else {
                debug_print(_("TLSv1 available\n"));
@@ -76,24 +76,24 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
        gint ret;
 
        switch (method) {
-               case SSL_METHOD_SSLv23:
-                       if (!ssl_ctx_SSLv23) {
-                               log_warning(_("SSL method not available\n"));
-                               return FALSE;
-                       }
-                       sockinfo->ssl = SSL_new(ssl_ctx_SSLv23);
-                       break;
-               case SSL_METHOD_TLSv1:
-                       if (!ssl_ctx_TLSv1) {
-                               log_warning(_("SSL method not available\n"));
-                               return FALSE;
-                       }
-                       sockinfo->ssl = SSL_new(ssl_ctx_TLSv1);
-                       break;
-               default:
-                       log_warning(_("Unknown SSL method *PROGRAM BUG*\n"));
+       case SSL_METHOD_SSLv23:
+               if (!ssl_ctx_SSLv23) {
+                       log_warning(_("SSL method not available\n"));
                        return FALSE;
-                       break;
+               }
+               sockinfo->ssl = SSL_new(ssl_ctx_SSLv23);
+               break;
+       case SSL_METHOD_TLSv1:
+               if (!ssl_ctx_TLSv1) {
+                       log_warning(_("SSL method not available\n"));
+                       return FALSE;
+               }
+               sockinfo->ssl = SSL_new(ssl_ctx_TLSv1);
+               break;
+       default:
+               log_warning(_("Unknown SSL method *PROGRAM BUG*\n"));
+               return FALSE;
+               break;
        }
 
        if (sockinfo->ssl == NULL) {
@@ -109,6 +109,7 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
        }
 
        /* Get the cipher */
+
        log_print(_("SSL connection using %s\n"), SSL_get_cipher(sockinfo->ssl));
 
        /* Get server's certificate (note: beware of dynamic allocation) */

diff --git a/src/ssl.h b/src/ssl.h
index 5f14e25..e3c5e6b 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -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
@@ -40,11 +40,12 @@ typedef enum {
        SSL_METHOD_TLSv1
 } SSLMethod;
 
-void ssl_init(void);
-void ssl_done(void);
-gboolean ssl_init_socket(SockInfo *sockinfo);
-gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method);
-void ssl_done_socket(SockInfo *sockinfo);
+void ssl_init                          (void);
+void ssl_done                          (void);
+gboolean ssl_init_socket               (SockInfo       *sockinfo);
+gboolean ssl_init_socket_with_method   (SockInfo       *sockinfo,
+                                        SSLMethod       method);
+void ssl_done_socket                   (SockInfo       *sockinfo);
 
 #endif /* USE_SSL */