aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-config.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ceebff7715..61dde25961 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-24 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-config.c (pgpopen): Fix the boolean check to be && and not
+ ||.
+
2001-11-27 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c (format_mime_part): Reverted the non-NULL
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 40be7662f0..91acb931ab 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1281,7 +1281,7 @@ pgpopen (const char *command, const char *mode)
g_return_val_if_fail (command != NULL, NULL);
- if (*mode != 'r' || *mode != 'w')
+ if (*mode != 'r' && *mode != 'w')
return NULL;
argv = g_strsplit (command, " ", 0);