diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-03-03 00:33:49 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-03-03 00:33:49 +0800 |
| commit | 6db171ad88bcdd8104a9044b7dead59c0e2e8bf2 (patch) | |
| tree | 00cd63114e7703649a3e6dd1f55925d2d1155331 /mail | |
| parent | c0635e17d9f13c1f923067e6a2a13768ba6944f6 (diff) | |
| download | gsoc2013-evolution-6db171ad88bcdd8104a9044b7dead59c0e2e8bf2.tar gsoc2013-evolution-6db171ad88bcdd8104a9044b7dead59c0e2e8bf2.tar.gz gsoc2013-evolution-6db171ad88bcdd8104a9044b7dead59c0e2e8bf2.tar.bz2 gsoc2013-evolution-6db171ad88bcdd8104a9044b7dead59c0e2e8bf2.tar.lz gsoc2013-evolution-6db171ad88bcdd8104a9044b7dead59c0e2e8bf2.tar.xz gsoc2013-evolution-6db171ad88bcdd8104a9044b7dead59c0e2e8bf2.tar.zst gsoc2013-evolution-6db171ad88bcdd8104a9044b7dead59c0e2e8bf2.zip | |
Bug #643402 - Fails to build with --disable-smime
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-account-editor.c | 8 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index e7973cd774..0c2e2744c0 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -68,7 +68,7 @@ #include "mail-ops.h" #include "mail-mt.h" -#if defined (HAVE_NSS) +#if defined (HAVE_NSS) && defined (ENABLE_SMIME) #include "smime/gui/e-cert-selector.h" #endif @@ -1131,7 +1131,7 @@ emae_account_folder (EMAccountEditor *emae, const gchar *name, gint item, gint d return folder; } -#if defined (HAVE_NSS) +#if defined (HAVE_NSS) && defined (ENABLE_SMIME) static void smime_changed (EMAccountEditor *emae) { @@ -3116,7 +3116,7 @@ static GtkWidget * emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; -#if defined (HAVE_NSS) +#if defined (HAVE_NSS) && defined (ENABLE_SMIME) EMAccountEditorPrivate *priv = emae->priv; #endif GtkWidget *w; @@ -3136,7 +3136,7 @@ emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget emae_account_toggle (emae, "pgp_no_imip_sign", E_ACCOUNT_PGP_NO_IMIP_SIGN, builder); emae_account_toggle (emae, "pgp_always_trust", E_ACCOUNT_PGP_ALWAYS_TRUST, builder); -#if defined (HAVE_NSS) +#if defined (HAVE_NSS) && defined (ENABLE_SMIME) /* TODO: this should handle its entry separately? */ priv->smime_sign_key = emae_account_entry (emae, "smime_sign_key", E_ACCOUNT_SMIME_SIGN_KEY, builder); priv->smime_sign_key_select = (GtkButton *)e_builder_get_widget (builder, "smime_sign_key_select"); diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index e654e87449..85aba9da71 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -50,7 +50,7 @@ #include <e-util/e-dialog-utils.h> #include <e-util/e-icon-factory.h> -#ifdef HAVE_NSS +#if defined (HAVE_NSS) && defined (ENABLE_SMIME) #include "certificate-viewer.h" #include "e-cert-db.h" #endif @@ -172,7 +172,7 @@ efhd_xpkcs7mime_info_response (GtkWidget *widget, po->widget = NULL; } -#ifdef HAVE_NSS +#if defined (HAVE_NSS) && defined (ENABLE_SMIME) static void efhd_xpkcs7mime_viewcert_clicked (GtkWidget *button, struct _smime_pobject *po) @@ -225,14 +225,14 @@ efhd_xpkcs7mime_add_cert_table (GtkWidget *vbox, if (l) { GtkWidget *w; -#if defined(HAVE_NSS) +#if defined (HAVE_NSS) && defined (ENABLE_SMIME) ECert *ec = NULL; #endif w = gtk_label_new (l); gtk_misc_set_alignment ((GtkMisc *)w, 0.0, 0.5); g_free (la); gtk_table_attach (table, w, 0, 1, n, n+1, GTK_FILL, GTK_FILL, 3, 3); -#if defined(HAVE_NSS) +#if defined (HAVE_NSS) && defined (ENABLE_SMIME) w = gtk_button_new_with_mnemonic(_("_View Certificate")); gtk_table_attach (table, w, 1, 2, n, n+1, 0, 0, 3, 3); g_object_set_data((GObject *)w, "e-cert-info", info); |