diff options
Diffstat (limited to 'capplet')
| -rw-r--r-- | capplet/Makefile.am | 7 | ||||
| -rw-r--r-- | capplet/settings/Makefile.am | 8 | ||||
| -rw-r--r-- | capplet/settings/mail-capplet-shell.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/capplet/Makefile.am b/capplet/Makefile.am index 14247f1fbb..f5b32eff7c 100644 --- a/capplet/Makefile.am +++ b/capplet/Makefile.am @@ -15,8 +15,8 @@ evolution_settings_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/smime/lib \ -I$(top_srcdir)/smime/gui \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ @@ -42,13 +42,12 @@ evolution_settings_LDFLAGS = -mwindows endif evolution_settings_LDADD = \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) \ $(CANBERRA_LIBS) \ $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ $(SMIME_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am index dd8c3c9a45..9bd84db94b 100644 --- a/capplet/settings/Makefile.am +++ b/capplet/settings/Makefile.am @@ -16,10 +16,11 @@ libevolution_mail_settings_la_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/smime/lib \ -I$(top_srcdir)/smime/gui \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ + $(GTKHTML_CFLAGS) \ -DANJAL_SETTINGS \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ @@ -52,13 +53,12 @@ libevolution_mail_settings_la_SOURCES = \ mail-guess-servers.h libevolution_mail_settings_la_LIBADD = \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) \ $(CANBERRA_LIBS) \ $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ $(SMIME_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index dba46a804f..91a82b6757 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -279,7 +279,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, mail_config_init (session); mail_msg_init (); custom_dir = g_build_filename (e_get_user_data_dir (), "mail", NULL); - e_mail_store_init (session, custom_dir); + e_mail_store_init (shell->priv->backend, custom_dir); g_free (custom_dir); if (just_druid) { |