diff options
Diffstat (limited to 'plugins/imap-features')
-rw-r--r-- | plugins/imap-features/Makefile.am | 9 | ||||
-rw-r--r-- | plugins/imap-features/imap-headers.c | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index 69b94ffbb1..cf7dbd79c9 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -1,7 +1,3 @@ -if OS_WIN32 -NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la -endif - INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ @@ -18,8 +14,9 @@ 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) \ +liborg_gnome_imap_features_la_LIBADD= \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-module-mail.la \ $(EVOLUTION_MAIL_LIBS) diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index c33a02bdef..7fa7d4685d 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; |