aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/imap-features
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/imap-features')
-rw-r--r--plugins/imap-features/Makefile.am7
-rw-r--r--plugins/imap-features/imap-headers.c5
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index c539a70cb2..d21841f7c7 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -18,9 +18,10 @@ plugin_LTLIBRARIES = liborg-gnome-imap-features.la
liborg_gnome_imap_features_la_SOURCES = \
imap-headers.c
-liborg_gnome_imap_features_la_LIBADD= \
- $(NO_UNDEFINED_REQUIRED_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+liborg_gnome_imap_features_la_LIBADD= \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/mail/libevolution-mail.la \
+ $(EVOLUTION_MAIL_LIBS)
liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index ea969b2b3a..91ef049003 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -31,8 +31,7 @@
#include <gtk/gtk.h>
-#include <libedataserver/e-account.h>
-#include <libedataserver/e-account-list.h>
+#include "e-util/e-account-utils.h"
#include <camel/camel-url.h>
#include <camel/camel-exception.h>
@@ -84,7 +83,7 @@ imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data)
if (g_str_has_prefix (account->source->url, "imap://") ||
(use_imap && g_str_has_prefix (account->source->url, "groupwise://"))) {
EAccount *temp = NULL;
- EAccountList *accounts = mail_config_get_accounts ();
+ EAccountList *accounts = e_get_account_list ();
CamelURL *url = NULL;
CamelException ex;
GtkTreeModel *model;