diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
| commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
| tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /plugins/imap-features | |
| parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
| parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
| download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip | |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'plugins/imap-features')
| -rw-r--r-- | plugins/imap-features/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/imap-features/imap-headers.c | 5 |
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 0154074498..baa6ee43dc 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; |