diff options
| author | Jeffrey Stedfast <fejj@helixcode.com> | 2000-11-04 02:55:41 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-11-04 02:55:41 +0800 |
| commit | 1cb19b5a1b927467589f3b0700c80d74669f8735 (patch) | |
| tree | bbd4c096a8de075c2573a49ec002d1fc86baf2de /mail/mail-crypto.c | |
| parent | 19983a967556879fb9947c4319dbc9250a304168 (diff) | |
| download | gsoc2013-evolution-1cb19b5a1b927467589f3b0700c80d74669f8735.tar gsoc2013-evolution-1cb19b5a1b927467589f3b0700c80d74669f8735.tar.gz gsoc2013-evolution-1cb19b5a1b927467589f3b0700c80d74669f8735.tar.bz2 gsoc2013-evolution-1cb19b5a1b927467589f3b0700c80d74669f8735.tar.lz gsoc2013-evolution-1cb19b5a1b927467589f3b0700c80d74669f8735.tar.xz gsoc2013-evolution-1cb19b5a1b927467589f3b0700c80d74669f8735.tar.zst gsoc2013-evolution-1cb19b5a1b927467589f3b0700c80d74669f8735.zip | |
Added new header files.
2000-11-03 Jeffrey Stedfast <fejj@helixcode.com>
* Makefile.am: Added new header files.
* component-factory.c (owner_set_cb):
s/session_init/mail_session_init
* session.c: Renamed public functions to mail_session_*.
FIXME: Rename session.c to mail-session.c
* folder-browser-factory.c: #include "mail-callbacks.h", #include
"mail-session.h" and replace forget_passwords with
mail_session_forget_passwords
* mail.h: Move session prototypes to mail-session.h, Move
mail-crypto prototypes to mail-crypto.h, Move mail-callback
prototypes to mail-callbacks.h
* mail-session.h: New header file containing public prototypes
for session.c
* mail-format.c: #include "mail-crypto.h"
* mail-view.c:
* folder-browser.c: #include "mail-callbacks.h"
* mail-crypto.h: New header file containing public prototypes
for mail-crypto.c
* mail-callbacks.h: New header file containing public prototypes
for mail-callbacks.c
* message-list.c (message_list_get_layout): Set useful defaults.
(message_list_setup_etable): Don't set the Outbox defaults on a
folder just because it doesn't have a corresponding saved file.
svn path=/trunk/; revision=6372
Diffstat (limited to 'mail/mail-crypto.c')
| -rw-r--r-- | mail/mail-crypto.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c index 5d97b7d46a..00428a5b29 100644 --- a/mail/mail-crypto.c +++ b/mail/mail-crypto.c @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * mail-crypto.h: OpenPGP en/decryption & signature code + * mail-crypto.c: OpenPGP en/decryption & signature code * * FIXME FIXME FIXME: This should be in its own library or component */ @@ -37,10 +37,9 @@ #ifdef PGP_PROGRAM #include <stdlib.h> #include <string.h> -#include <glib.h> -#include <gnome.h> -#include "mail.h" +#include "mail-crypto.h" +#include "mail-session.h" #include <dirent.h> #include <errno.h> @@ -341,7 +340,7 @@ mail_crypto_openpgp_decrypt (const char *ciphertext, CamelException *ex) int passwd_fds[2]; char passwd_fd[32]; - passphrase = mail_request_dialog ( + passphrase = mail_session_request_dialog ( _("Please enter your PGP/GPG passphrase."), TRUE, "pgp", FALSE); if (!passphrase) { @@ -437,7 +436,7 @@ mail_crypto_openpgp_encrypt (const char *plaintext, if (sign) { /* we only need the passphrase if we plan to sign */ - passphrase = mail_request_dialog ( + passphrase = mail_session_request_dialog ( _("Please enter your PGP/GPG passphrase."), TRUE, "pgp", FALSE); if (!passphrase) { @@ -601,8 +600,8 @@ mail_crypto_openpgp_clearsign (const char *plaintext, const char *userid, return NULL; #endif - passphrase = mail_request_dialog (_("Please enter your PGP/GPG passphrase."), - TRUE, "pgp", FALSE); + passphrase = mail_session_request_dialog (_("Please enter your PGP/GPG passphrase."), + TRUE, "pgp", FALSE); if (!passphrase) { camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, |