aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-ops.c5
-rw-r--r--mail/openpgp-utils.c6
3 files changed, 14 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8c8e968bf4..1413fb535e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-03 Jeffrey Stedfast <fejj@ximian.com>
+
+ * openpgp-utils.c (openpgp_encrypt): Add --no-tty argument to gpg.
+
2001-04-03 Dan Winship <danw@ximian.com>
* folder-browser-factory.c (control_activate): Sync the folder on
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 40f3a72309..57397af8e7 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -991,6 +991,7 @@ add_vtrash_info (CamelFolderInfo *info)
g_return_if_fail (info != NULL);
for (fi = info; fi->sibling; fi = fi->sibling) {
+ g_warning ("add_vtrash_info(): url is %s", fi->url);
if (!strcmp (fi->name, _("Trash")))
break;
}
@@ -1028,7 +1029,9 @@ static void get_folderinfo_get(struct _mail_msg *mm)
struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
camel_operation_register(mm->cancel);
- m->info = camel_store_get_folder_info(m->store, NULL, FALSE, TRUE, camel_store_supports_subscriptions(m->store), &mm->ex);
+ m->info = camel_store_get_folder_info (m->store, NULL, FALSE, TRUE,
+ camel_store_supports_subscriptions (m->store),
+ &mm->ex);
if (m->info && m->info->url)
add_vtrash_info (m->info);
camel_operation_unregister(mm->cancel);
diff --git a/mail/openpgp-utils.c b/mail/openpgp-utils.c
index 4489f463ec..1377793b6a 100644
--- a/mail/openpgp-utils.c
+++ b/mail/openpgp-utils.c
@@ -505,6 +505,7 @@ openpgp_decrypt (const gchar *ciphertext, gint cipherlen, gint *outlen, CamelExc
putenv (passwd_fd);
break;
default:
+ g_assert_not_reached ();
break;
}
@@ -617,6 +618,7 @@ openpgp_encrypt (const gchar *in, gint inlen, const GPtrArray *recipients,
g_ptr_array_add (argv, "--verbose");
g_ptr_array_add (argv, "--yes");
g_ptr_array_add (argv, "--batch");
+ g_ptr_array_add (argv, "--no-tty");
g_ptr_array_add (argv, "--armor");
@@ -701,6 +703,7 @@ openpgp_encrypt (const gchar *in, gint inlen, const GPtrArray *recipients,
}
break;
default:
+ g_assert_not_reached ();
break;
}
@@ -860,6 +863,7 @@ openpgp_clearsign (const gchar *plaintext, const gchar *userid,
putenv (passwd_fd);
break;
default:
+ g_assert_not_reached ();
break;
}
@@ -1012,6 +1016,7 @@ openpgp_sign (const gchar *in, gint inlen, const gchar *userid,
putenv (passwd_fd);
break;
default:
+ g_assert_not_reached ();
break;
}
@@ -1132,6 +1137,7 @@ openpgp_verify (const gchar *in, gint inlen, const gchar *sigin, gint siglen, Ca
break;
default:
+ g_assert_not_reached ();
break;
}