diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.ja | 7 | ||||
| -rw-r--r-- | libsylph/pop.h | 2 | ||||
| -rw-r--r-- | libsylph/prefs_account.c | 4 | ||||
| -rw-r--r-- | libsylph/prefs_account.h | 14 | ||||
| -rw-r--r-- | libsylph/prefs_common.c | 4 | ||||
| -rw-r--r-- | libsylph/prefs_common.h | 2 |
7 files changed, 17 insertions, 22 deletions
@@ -1,3 +1,9 @@ +2005-09-06 + + * libsylph/prefs_common.[ch] + libsylph/prefs_account.[ch] + libsylph/pop.h: save GPG settings even if GPGME is disabled. + 2005-09-05 * libsylph/imap.c: show progress when executing operations which diff --git a/ChangeLog.ja b/ChangeLog.ja index 5284dd8d..e5459eef 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,10 @@ +2005-09-06 + + * libsylph/prefs_common.[ch] + libsylph/prefs_account.[ch] + libsylph/pop.h: GPGME が無効にされていても GPG の設定を保存する + ようにした。 + 2005-09-05 * libsylph/imap.c: 長時間かかる操作を実行しているときに進捗を表示する diff --git a/libsylph/pop.h b/libsylph/pop.h index 515bc61b..1a5094de 100644 --- a/libsylph/pop.h +++ b/libsylph/pop.h @@ -38,9 +38,7 @@ typedef struct _Pop3Session Pop3Session; typedef enum { POP3_READY, POP3_GREETING, -#if USE_SSL POP3_STLS, -#endif POP3_GETAUTH_USER, POP3_GETAUTH_PASS, POP3_GETAUTH_APOP, diff --git a/libsylph/prefs_account.c b/libsylph/prefs_account.c index b6d15fba..22686380 100644 --- a/libsylph/prefs_account.c +++ b/libsylph/prefs_account.c @@ -86,7 +86,6 @@ static PrefParam param[] = { {"set_autoreplyto", "FALSE", &tmp_ac_prefs.set_autoreplyto, P_BOOL}, {"auto_replyto", NULL, &tmp_ac_prefs.auto_replyto, P_STRING}, -#if USE_GPGME /* Privacy */ {"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL}, {"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL}, @@ -95,16 +94,13 @@ static PrefParam param[] = { {"clearsign", "FALSE", &tmp_ac_prefs.clearsign, P_BOOL}, {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM}, {"sign_key_id", NULL, &tmp_ac_prefs.sign_key_id, P_STRING}, -#endif /* USE_GPGME */ -#if USE_SSL /* SSL */ {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM}, {"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM}, {"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM}, {"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM}, {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL}, -#endif /* USE_SSL */ /* Advanced */ {"set_smtpport", "FALSE", &tmp_ac_prefs.set_smtpport, P_BOOL}, diff --git a/libsylph/prefs_account.h b/libsylph/prefs_account.h index 13ef8d94..3a797fc2 100644 --- a/libsylph/prefs_account.h +++ b/libsylph/prefs_account.h @@ -47,13 +47,11 @@ typedef enum { SIG_DIRECT } SigType; -#if USE_GPGME typedef enum { SIGN_KEY_DEFAULT, SIGN_KEY_BY_FROM, SIGN_KEY_CUSTOM } SignKeyType; -#endif /* USE_GPGME */ struct _PrefsAccount { @@ -73,14 +71,12 @@ struct _PrefsAccount gchar *userid; gchar *passwd; -#if USE_SSL /* SSL */ - SSLType ssl_pop; - SSLType ssl_imap; - SSLType ssl_nntp; - SSLType ssl_smtp; + gint ssl_pop; + gint ssl_imap; + gint ssl_nntp; + gint ssl_smtp; gboolean use_nonblocking_ssl; -#endif /* USE_SSL */ /* Temporarily preserved password */ gchar *tmp_pass; @@ -125,7 +121,6 @@ struct _PrefsAccount gboolean set_autoreplyto; gchar *auto_replyto; -#if USE_GPGME /* Privacy */ gboolean default_sign; gboolean default_encrypt; @@ -135,7 +130,6 @@ struct _PrefsAccount SignKeyType sign_key; gchar *sign_key_id; -#endif /* USE_GPGME */ /* Advanced */ gboolean set_smtpport; diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c index eb1a1864..725a6f24 100644 --- a/libsylph/prefs_common.c +++ b/libsylph/prefs_common.c @@ -266,7 +266,6 @@ static PrefParam param[] = { {"filter_junk_on_receive", "FALSE", &prefs_common.filter_junk_on_recv, P_BOOL}, -#if USE_GPGME /* Privacy */ {"auto_check_signatures", "TRUE", &prefs_common.auto_check_signatures, P_BOOL}, @@ -275,11 +274,8 @@ static PrefParam param[] = { {"store_passphrase", "FALSE", &prefs_common.store_passphrase, P_BOOL}, {"store_passphrase_timeout", "0", &prefs_common.store_passphrase_timeout, P_INT}, -#ifndef G_OS_WIN32 {"passphrase_grab", "FALSE", &prefs_common.passphrase_grab, P_BOOL}, -#endif /* G_OS_WIN32 */ {"gpg_warning", "TRUE", &prefs_common.gpg_warning, P_BOOL}, -#endif /* USE_GPGME */ /* Interface */ {"separate_folder", "FALSE", &prefs_common.sep_folder, P_BOOL}, diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h index afc5f1d0..8c640f1d 100644 --- a/libsylph/prefs_common.h +++ b/libsylph/prefs_common.h @@ -193,7 +193,6 @@ struct _PrefsCommon gchar *junk_folder; gboolean filter_junk_on_recv; -#if USE_GPGME /* Privacy */ gboolean auto_check_signatures; gboolean gpg_signature_popup; @@ -201,7 +200,6 @@ struct _PrefsCommon gint store_passphrase_timeout; gboolean passphrase_grab; gboolean gpg_warning; -#endif /* USE_GPGME */ /* Interface */ gboolean sep_folder; |