* src/modest-defs.h:

[modest] / src / maemo / easysetup / modest-easysetup-wizard.h

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.h b/src/maemo/easysetup/modest-easysetup-wizard.h
index 6814280..9f9ff6a 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.h
+++ b/src/maemo/easysetup/modest-easysetup-wizard.h
@@ -57,9 +57,9 @@ G_BEGIN_DECLS
        (G_TYPE_CHECK_CLASS_CAST ((klass), \
        MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, ModestEasysetupWizardDialogClass))
 
-#define ACCOUNT_IS_WIZARD_DIALOG(obj) \
-       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-       MODEST_TYPE_EASYSETUP_WIZARD_DIALOG))
+#define MODEST_IS_EASYSETUP_WIZARD_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                             \
+                                    MODEST_TYPE_EASYSETUP_WIZARD_DIALOG))
 
 #define MODEST_EASYSETUP_IS_WIZARD_DIALOG_CLASS(klass) \
        (G_TYPE_CHECK_CLASS_TYPE ((klass), \
@@ -75,12 +75,8 @@ typedef struct {
        /* Used by derived widgets to query existing accounts,
         * and to create new accounts: */
        ModestAccountMgr *account_manager;
+       ModestAccountSettings *settings;
        
-       /* 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;
-               
        /* notebook pages: */
        GtkWidget *page_welcome;
        
@@ -112,7 +108,6 @@ typedef struct {
        GtkWidget *button_outgoing_smtp_servers;
        
        GtkWidget *page_complete_customsetup;
-       GtkWidget *button_edit;
        
        GtkWidget *specific_window;
        
@@ -125,6 +120,11 @@ typedef struct {
 
 GType modest_easysetup_wizard_dialog_get_type (void);
 
+/*
+ * NOTE: can be instantiated only once; after that, this function will
+ * return NULL, until the one before is destroyed; if it returns NULL
+ * it will gtk_window_present the existing one.
+ */
 ModestEasysetupWizardDialog* modest_easysetup_wizard_dialog_new (void);
 
 G_END_DECLS