[evolution-ews] Revert broken Windows build fix

[David Woodhouse <dwmw2 src gnome org>]

commit 8cf9b6444bf62f1c97bd2d0779eec7ec221e73ff
Author: David Woodhouse <David Woodhouse intel com>
Date:   Fri May 6 23:39:58 2011 +0100

    Revert broken Windows build fix
    
    This calls a function that only exists in e-util.so. But you can't do that
    from the back ends; that's an Evolution GUI library and doesn't exist in
    e-calendar-factory and e-addressbook-factory.
    
    Conversely, we *can* link to camel libraries from the account setup
    plugin (at least for now). And we do. So removing the linkage results
    in:
    (evolution:29894): evolution-plugin-lib-WARNING **: can't load plugin '/usr/lib64/evolution/3.0/plugins/liborg-gnome-exchange-ews.so': /usr/lib64/evolution/3.0/plugins/liborg-gnome-exchange-ews.so: undefined symbol: camel_ews_store_summary_remove

 src/account-setup-eplugin/Makefile.am |    1 +
 src/server/e-ews-item.c               |    5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/account-setup-eplugin/Makefile.am b/src/account-setup-eplugin/Makefile.am
index caee881..2e529a6 100644
--- a/src/account-setup-eplugin/Makefile.am
+++ b/src/account-setup-eplugin/Makefile.am
@@ -34,6 +34,7 @@ liborg_gnome_exchange_ews_la_SOURCES = 		\
 liborg_gnome_exchange_ews_la_LIBADD = 			\
 	$(top_builddir)/src/server/libeews-1.2.la	\
 	$(top_builddir)/src/utils/libewsutils.la 	\
+	$(top_builddir)/src/camel/libcamelews.la 	\
 	$(EVOLUTION_PLUGIN_LIBS)			\
 	$(EVOLUTION_SHELL_LIBS) \
 	$(CAMEL_LIBS) 					\
diff --git a/src/server/e-ews-item.c b/src/server/e-ews-item.c
index 26cc9b7..4c74cad 100644
--- a/src/server/e-ews-item.c
+++ b/src/server/e-ews-item.c
@@ -30,7 +30,6 @@
 #include <glib/gstdio.h>
 #include <glib/gprintf.h>
 #include <libsoup/soup-misc.h>
-#include <e-util/e-mktemp.h>
 #include "e-ews-item.h"
 #include "e-ews-connection.h"
 #include "e-ews-message.h"
@@ -854,7 +853,7 @@ e_ews_dump_file_attachment_from_soap_parameter (ESoapParameter *param, const gch
 	tmpdir = g_strndup(tmpfilename, g_strrstr (tmpfilename, "/") - tmpfilename);
 
 	snprintf(dirname, 350, "%s/XXXXXX", tmpdir);
-	if (!e_mkdtemp(dirname))
+	if (!mkdtemp(dirname))
 		g_warning ("Failed to create directory for attachment cache");
 	surename = g_uri_escape_string(name, "", TRUE);
 	snprintf(filename, 350, "%s/%s", dirname, surename);
@@ -883,7 +882,7 @@ e_ews_item_dump_mime_content(EEwsItem *item, const gchar *cache) {
 	tmpdir = g_strndup(tmpfilename, g_strrstr (tmpfilename, "/") - tmpfilename);
 
 	snprintf(dirname, 350, "%s/XXXXXX", tmpdir);
-	if (!e_mkdtemp(dirname))
+	if (!mkdtemp(dirname))
 		g_warning ("Failed to create directory for attachment cache");
 
 	surename = g_uri_escape_string(item->priv->subject, "", TRUE);