When creating each page in the account setup wizard don't check

[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 adb610b..d93bd22 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.h
+++ b/src/maemo/easysetup/modest-easysetup-wizard.h
@@ -1,6 +1,30 @@
-/* Copyright (c) 2007, Nokia Corporation
+/* Copyright (c) 2006, Nokia Corporation
  * All rights reserved.
  *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef _MODEST_EAYSETUP_WIZARD_DIALOG
@@ -9,7 +33,17 @@
 /* #include <hildon-widgets/hildon-wizard-dialog.h> */
 #include "modest-wizard-dialog.h" /* We use a copied-and-improved HildonWizardDialog. */
 #include "modest-account-mgr.h"
+#include <config.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
 #include <hildon-widgets/hildon-caption.h>
+#else
+#include <hildon/hildon-caption.h>
+#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
 
 G_BEGIN_DECLS
 
@@ -23,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), \
@@ -78,7 +112,6 @@ typedef struct {
        GtkWidget *button_outgoing_smtp_servers;
        
        GtkWidget *page_complete_customsetup;
-       GtkWidget *button_edit;
        
        GtkWidget *specific_window;
        
@@ -91,6 +124,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