X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=e44c0c630c115ad6e17fb71c50aaafd55a4a19a0;hp=460c7b08f67a9053f9a333ef047a2e1439c007b9;hb=bb790bd8b50e81a1e965341d010864d6000c5b38;hpb=e7aa48ed52565f434a99141e9478980d23fa3a3a

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 460c7b0..e44c0c6 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -48,7 +48,11 @@
 
 #include "modest-account-mgr-helpers.h"
 #include "modest-mail-operation.h"
+
+#ifdef MODEST_HAVE_EASYSETUP
 #include "easysetup/modest-easysetup-wizard.h"
+#endif /*MODEST_HAVE_EASYSETUP*/
+
 #include <modest-widget-memory.h>
 #include <tny-error.h>
 #include <tny-simple-list.h>
@@ -206,14 +210,6 @@ void
 modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 {
 	GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr());
-	
-#if 0
-	GSList *account_names = modest_account_mgr_search_server_accounts (
-		modest_runtime_get_account_mgr(),
-		NULL /* account_name, any */,
-		MODEST_PROTOCOL_TYPE_UNKNOWN /* type */,
-		MODEST_PROTOCOL_UNKNOWN /* proto */);
-#endif
 						     
 	gboolean accounts_exist = account_names != NULL;
 	g_slist_free (account_names);
@@ -224,7 +220,6 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
 	/* To test, while modest_account_mgr_account_names() is broken: accounts_exist = TRUE; */
 	if (!accounts_exist) {
-		printf ("debug: modest_account_mgr_account_names() returned NULL.\n");
 		/* If there are no accounts yet, just show the easy-setup wizard, as per the UI spec: */
 		ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
 		gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));