aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--libsylph/prefs_common.c6
-rw-r--r--src/prefs_common_dialog.c2
4 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f6501cda..f75798fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-11-10
+ * libsylph/prefs_common.c
+ src/prefs_common_dialog.c: don't show gpg warning on win32 by
+ default. Changed "gpg_warning" to "show_gpg_warning".
+
+2005-11-10
+
* src/rfc2015.[ch]
src/main.c: implemented rfc2015_disable_all() and
rfc2015_is_available().
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 7dcf5d6f..a24256c1 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2005-11-10
+ * libsylph/prefs_common.c
+ src/prefs_common_dialog.c: win32 ではデフォルトで gpg の警告を
+ 表示しないようにした。 "gpg_warning" を "show_gpg_warning" に変更。
+
+2005-11-10
+
* src/rfc2015.[ch]
src/main.c: rfc2015_disable_all() と rfc2015_is_available() を実装。
* src/compose.c: PGP が利用不可の場合は PGP チェックボックスを隠す
diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c
index 9e53a98f..73c21817 100644
--- a/libsylph/prefs_common.c
+++ b/libsylph/prefs_common.c
@@ -292,7 +292,11 @@ static PrefParam param[] = {
{"store_passphrase_timeout", "0",
&prefs_common.store_passphrase_timeout, P_INT},
{"passphrase_grab", "FALSE", &prefs_common.passphrase_grab, P_BOOL},
- {"gpg_warning", "TRUE", &prefs_common.gpg_warning, P_BOOL},
+#ifdef G_OS_WIN32
+ {"show_gpg_warning", "FALSE", &prefs_common.gpg_warning, P_BOOL},
+#else
+ {"show_gpg_warning", "TRUE", &prefs_common.gpg_warning, P_BOOL},
+#endif
/* Interface */
{"separate_folder", "FALSE", &prefs_common.sep_folder, P_BOOL},
diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c
index 56427a3c..46c061b5 100644
--- a/src/prefs_common_dialog.c
+++ b/src/prefs_common_dialog.c
@@ -424,7 +424,7 @@ static PrefsUIData ui_data[] = {
{"passphrase_grab", &privacy.checkbtn_passphrase_grab,
prefs_set_data_from_toggle, prefs_set_toggle},
#endif /* G_OS_WIN32 */
- {"gpg_warning", &privacy.checkbtn_gpg_warning,
+ {"show_gpg_warning", &privacy.checkbtn_gpg_warning,
prefs_set_data_from_toggle, prefs_set_toggle},
#endif /* USE_GPGME */