/* #include <hildon-widgets/hildon-wizard-dialog.h> */
#include "modest-wizard-dialog.h" /* We use a copied-and-improved HildonWizardDialog. */
-#include "modest-account-mgr/modest-account-mgr.h"
+#include "modest-account-mgr.h"
+#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef MODEST_HILDON_VERSION_0
#include <hildon-widgets/hildon-caption.h>
+#else
+#include <hildon/hildon-caption.h>
+#endif /*MODEST_HILDON_VERSION_0*/
G_BEGIN_DECLS
/* Used by derived widgets to query existing accounts,
* and to create new accounts: */
ModestAccountMgr *account_manager;
+
+ /* Whether we saved the account before we were finished,
+ * to allow editing via the Advanced Settings dialog.
+ * We might need to delete the account if Finish is never clicked. */
+ gchar* saved_account_name;
- /* These widgets are only for use by derived widgets: */
- /* Pages that are common to all account wizards: */
+ /* notebook pages: */
GtkWidget *page_welcome;
GtkWidget *page_account_details;
GtkWidget *page_complete_customsetup;
GtkWidget *button_edit;
+ GtkWidget *specific_window;
+
} ModestEasysetupWizardDialog;
typedef struct {