* cleaner version of the patch to make sure no double account-setup-wizards are

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

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index 62c15e9..46a6472 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -70,10 +70,6 @@ G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODE
 
 typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate;
 
-/* global to make sure there is only one of this
- * dialog at any time
- */
-static ModestEasysetupWizardDialog *_instance = NULL;
 
 typedef enum {
        MODEST_EASYSETUP_WIZARD_DIALOG_INCOMING_CHANGED = 0x01,
@@ -145,8 +141,6 @@ modest_easysetup_wizard_dialog_finalize (GObject *object)
        g_free (self->saved_account_name);
        
        G_OBJECT_CLASS (modest_easysetup_wizard_dialog_parent_class)->finalize (object);
-
-       _instance = NULL;
 }
 
 static void
@@ -1159,16 +1153,10 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self)
 }
 
 ModestEasysetupWizardDialog*
-modest_easysetup_wizard_dialog_new_or_present (void)
+modest_easysetup_wizard_dialog_new (void)
 {      
-       if (_instance) {
-               g_message ("%s: already instantiated; presenting\n",
-                          __FUNCTION__);
-               gtk_window_present (GTK_WINDOW(_instance));
-               return NULL;
-       }
        
-       return _instance = g_object_new (MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, NULL);
+       return g_object_new (MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, NULL);
 }
 
 static void create_subsequent_customsetup_pages (ModestEasysetupWizardDialog *self)