diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-04-13 01:14:20 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-04-13 01:14:20 +0800 |
| commit | 769f404db36aa9082ac153c2935f1b7bfe1d3527 (patch) | |
| tree | a7b9d5c5442df7ecb8dc0a40cb62dab2eddadfe6 /mail/mail-accounts.c | |
| parent | fabdba6f1ca3ada8be27a81bdc069bdb8270e1c3 (diff) | |
| download | gsoc2013-evolution-769f404db36aa9082ac153c2935f1b7bfe1d3527.tar.gz gsoc2013-evolution-769f404db36aa9082ac153c2935f1b7bfe1d3527.tar.zst gsoc2013-evolution-769f404db36aa9082ac153c2935f1b7bfe1d3527.zip | |
Updated for changes to PGP code.
2001-04-12 Jeffrey Stedfast <fejj@ximian.com>
* mail-accounts.c (pgp_path_changed): Updated for changes to PGP
code.
* component-factory.c (owner_set_cb): Don't init openpgp anymore
because we don't need it.
* mail-crypto.c: Simply wrap the camel-pgp-mime functions (also
renamed the functions to be prefixed with mail_crypto).
* mail-format.c (handle_multipart_signed): Update to use
camel_pgp_mime_is_rfc2015_signed() and other camel-pgp-mime
functions.
(handle_multipart_encrypted): Same but for rfc2015_encrypted.
(decode_pgp): Updated to use camel-pgp-context
(try_inline_pgp): Updated to use camel-pgp-context's.
(try_inline_pgp_sig): Same.
svn path=/trunk/; revision=9269
Diffstat (limited to 'mail/mail-accounts.c')
| -rw-r--r-- | mail/mail-accounts.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index ab0ccbe5e9..09e1903cba 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -29,7 +29,7 @@ #include <string.h> #include <libgnomeui/gnome-stock.h> #include <camel/camel-url.h> -#include <openpgp-utils.h> +#include <camel/camel-pgp-context.h> #include "mail-accounts.h" #include "mail-config.h" @@ -492,18 +492,18 @@ static void pgp_path_changed (GtkEntry *entry, gpointer data) { const char *path, *bin; - PgpType type = PGP_TYPE_NONE; + CamelPgpType type = CAMEL_PGP_TYPE_NONE; path = gtk_entry_get_text (entry); bin = g_basename (path); /* FIXME: This detection should be better */ if (!strcmp (bin, "pgp")) - type = PGP_TYPE_PGP2; + type = CAMEL_PGP_TYPE_PGP2; else if (!strcmp (bin, "pgpv") || !strcmp (bin, "pgpe") || !strcmp (bin, "pgpk") || !strcmp (bin, "pgps")) - type = PGP_TYPE_PGP5; + type = CAMEL_PGP_TYPE_PGP5; else if (!strcmp (bin, "gpg")) - type = PGP_TYPE_GPG; + type = CAMEL_PGP_TYPE_GPG; mail_config_set_pgp_path (path && *path ? path : NULL); mail_config_set_pgp_type (type); |