X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=b06ad4be81d2153d3cb205239893388ae3d34756;hb=9edfe44eba9e0b83f6fde3eab558e069a648590c;hp=6750eb623c5d66f1d44b84e1c52073d2a528ccbd;hpb=5b154aa953f8d887437f91e0ad75288051fb498a;p=modest

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 6750eb6..b06ad4b 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -73,15 +73,6 @@
 #include "modest-account-mgr-helpers.h"
 #include "modest-mail-operation.h"
 #include "modest-text-utils.h"
-
-#ifdef MODEST_HAVE_EASYSETUP
-#ifdef MODEST_TOOLKIT_HILDON2
-#include "modest-easysetup-wizard-dialog.h"
-#else
-#include "easysetup/modest-easysetup-wizard-dialog.h"
-#endif
-#endif /* MODEST_HAVE_EASYSETUP */
-
 #include <modest-widget-memory.h>
 #include <tny-error.h>
 #include <tny-simple-list.h>
@@ -653,19 +644,19 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win)
 }
 
 void
-modest_ui_actions_on_accounts (GtkAction *action, 
+modest_ui_actions_on_accounts (GtkAction *action,
 			       ModestWindow *win)
 {
 	/* This is currently only implemented for Maemo */
 	if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
-		if (!modest_ui_actions_run_account_setup_wizard (win)) 
+		if (!modest_ui_actions_run_account_setup_wizard (win))
 			g_debug ("%s: wizard was already running", __FUNCTION__);
-		
+
 		return;
 	} else {
 		/* Show the list of accounts */
 		GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ());
-		
+
 		/* The accounts dialog must be modal */
 		modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (account_win), (GtkWindow *) win);
 		modest_utils_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win)); 
@@ -680,7 +671,7 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 	 * possiblities.
 	 */
 #ifndef MODEST_TOOLKIT_GTK /* Defined in config.h */
-	
+
 	/* Create the window if necessary: */
 	GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
 	modest_connection_specific_smtp_window_fill_with_connections (