aboutsummaryrefslogtreecommitdiffstats
path: root/smime
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-04 03:14:03 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-04 03:14:03 +0800
commit2a39437ee94059a79d3dc1bf0c97a3aeaff23f53 (patch)
tree657e23e83bad7ff98e891f45043a41b09ff57647 /smime
parenteecffa7af35a3eb0742bff4d10be55c3a70f2876 (diff)
downloadgsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.gz
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.bz2
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.lz
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.xz
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.zst
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.zip
Adapt to single-include E-D-S libraries.
Diffstat (limited to 'smime')
-rw-r--r--smime/gui/component.c2
-rw-r--r--smime/lib/e-cert-db.c3
-rw-r--r--smime/lib/e-cert.c1
-rw-r--r--smime/lib/e-pkcs12.c3
4 files changed, 5 insertions, 4 deletions
diff --git a/smime/gui/component.c b/smime/gui/component.c
index e902f43fd0..bf172194c1 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libedataserverui/e-passwords.h>
+#include <libedataserverui/libedataserverui.h>
#include "ca-trust-dialog.h"
#include "e-cert-db.h"
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 7cc7fc0939..c9dc1cae24 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -50,6 +50,8 @@
#include <camel/camel.h> /* FIXME: this is where camel_init is defined; it shouldn't include everything else */
+#include <libedataserverui/libedataserverui.h>
+
/* private NSS defines used by PSM */
/* (must be declated before cert.h) */
#define CERT_NewTempCertificate __CERT_NewTempCertificate
@@ -74,7 +76,6 @@
#include "prmem.h"
#include "e-util/e-util.h"
#include "e-util/e-util-private.h"
-#include <libedataserverui/e-passwords.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 0849634767..c3d0b7e351 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -46,7 +46,6 @@
#include <time.h>
#include <glib/gi18n.h>
-#include <libedataserver/e-data-server-util.h>
/* for e_utf8_strftime, what about e_time_format_time? */
#include <e-util/e-util.h>
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 7bdc9e7f1c..bc6377a0a1 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -46,12 +46,13 @@
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libedataserverui/e-passwords.h>
#include <time.h>
#include <fcntl.h>
#include <unistd.h>
+#include <libedataserverui/libedataserverui.h>
+
#include "e-cert-db.h"
#include "e-pkcs12.h"