[evolution-exchange] Fix linking issue in tools.

[Matthew Barnes <mbarnes src gnome org>]

commit 0d3f36365cfa70fc56b02bbbd87b8285b1a6ad80
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun May 23 10:23:30 2010 -0400

    Fix linking issue in tools.

 tools/Makefile.am                      |    4 ----
 tools/exchange-autoconfig-wizard.c     |   27 +++++++++++++++++++++------
 tools/exchange-share-config-listener.c |    2 --
 3 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5ce2253..5655d87 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -12,7 +12,6 @@ libevolution_exchange_shared_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN="\"evolution-exchange-storage\"" \
 	$(GNOME_PLATFORM_CFLAGS) \
 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
-	$(EVOLUTION_PLUGIN_CFLAGS) \
 	$(LDAP_CFLAGS) \
 	-DPREFIX=\""$(prefix)"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -30,7 +29,6 @@ libevolution_exchange_shared_la_LIBADD = \
 	$(top_builddir)/server/storage/libexchange-storage.la \
 	$(GNOME_PLATFORM_LIBS) \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
-	$(EVOLUTION_PLUGIN_LIBS) \
 	$(LDAP_LIBS)
 
 libevolution_exchange_shared_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
@@ -45,7 +43,6 @@ exchange_connector_setup_CPPFLAGS = \
 	-DG_LOG_DOMAIN="\"evolution-exchange-storage\"" \
 	$(GNOME_PLATFORM_CFLAGS) \
 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
-	$(EVOLUTION_PLUGIN_CFLAGS) \
 	$(LDAP_CFLAGS) \
 	-DPREFIX=\""$(prefix)"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -66,7 +63,6 @@ exchange_connector_setup_LDADD = \
 	$(top_builddir)/server/storage/libexchange-storage.la \
 	$(GNOME_PLATFORM_LIBS) \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
-	$(EVOLUTION_PLUGIN_LIBS) \
 	$(LDAP_LIBS)\
 	$(DNS_LIBS)
 
diff --git a/tools/exchange-autoconfig-wizard.c b/tools/exchange-autoconfig-wizard.c
index 2e16d15..f147f30 100644
--- a/tools/exchange-autoconfig-wizard.c
+++ b/tools/exchange-autoconfig-wizard.c
@@ -31,7 +31,6 @@
 
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
-#include <e-util/e-dialog-utils.h>
 #include <libedataserverui/e-passwords.h>
 
 #include <gconf/gconf-client.h>
@@ -525,6 +524,20 @@ is_active_exchange_account (EAccount *account)
 }
 
 static void
+autoconfig_notice (gpointer parent,
+                   GtkMessageType type,
+                   const gchar *string)
+{
+	GtkWidget *dialog;
+
+	dialog = gtk_message_dialog_new (
+		parent, GTK_DIALOG_DESTROY_WITH_PARENT, type,
+		GTK_BUTTONS_OK, "%s", string);
+	gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
+}
+
+static void
 autoconfig_gui_apply (ExchangeAutoconfigGUI *gui)
 {
 	EAccountList *list;
@@ -539,9 +552,10 @@ autoconfig_gui_apply (ExchangeAutoconfigGUI *gui)
 	list = e_account_list_new (gconf);
 	g_object_unref (gconf);
 	if (!list) {
-		e_notice (gui->assistant, GTK_MESSAGE_ERROR,
-			  _("Configuration system error.\n"
-			    "Unable to create new account."));
+		autoconfig_notice (
+			gui->assistant, GTK_MESSAGE_ERROR,
+			_("Configuration system error.\n"
+			  "Unable to create new account."));
 		return;
 	}
 
@@ -553,8 +567,9 @@ autoconfig_gui_apply (ExchangeAutoconfigGUI *gui)
 	     e_iterator_next (iter)) {
 		account = (EAccount *)e_iterator_get (iter);
 		if (account && (found = is_active_exchange_account (account))) {
-			e_notice (gui->assistant, GTK_MESSAGE_ERROR,
-			_("You may only configure a single Exchange account"));
+			autoconfig_notice (
+				gui->assistant, GTK_MESSAGE_ERROR,
+				_("You may only configure a single Exchange account"));
 			break;
 		}
 		account = NULL;
diff --git a/tools/exchange-share-config-listener.c b/tools/exchange-share-config-listener.c
index 556f9ec..0e787ed 100644
--- a/tools/exchange-share-config-listener.c
+++ b/tools/exchange-share-config-listener.c
@@ -45,8 +45,6 @@
 #include <exchange-account.h>
 #include <e-folder-exchange.h>
 
-#include <e-util/e-dialog-utils.h>
-
 #include "exchange-share-config-listener.h"
 
 struct _ExchangeShareConfigListenerPrivate {