Merge commit 'origin/kill-bonobo'

1 files changed, 61 insertions, 28 deletions

diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index 12e7506a23..83e9cd4885 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -25,9 +25,27 @@
 #define EM_ACCOUNT_EDITOR_H
 
 #include <gtk/gtk.h>
-
 #include <mail/em-config.h>
 
+/* Standard GObject macros */
+#define EM_TYPE_ACCOUNT_EDITOR \
+	(em_account_editor_get_type ())
+#define EM_ACCOUNT_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_ACCOUNT_EDITOR, EMAccountEditor))
+#define EM_ACCOUNT_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorClass))
+#define EM_IS_ACCOUNT_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_ACCOUNT_EDITOR))
+#define EM_IS_ACCOUNT_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_ACCOUNT_EDITOR))
+#define EM_ACCOUNT_EDITOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorClass))
+
 G_BEGIN_DECLS
 
 typedef struct _EMAccountEditor EMAccountEditor;
@@ -36,50 +54,65 @@ typedef struct _EMAccountEditorPrivate EMAccountEditorPrivate;
 
 typedef enum {
 	EMAE_NOTEBOOK,
-	EMAE_DRUID,
+	EMAE_ASSISTANT,
 	EMAE_PAGES
-} em_account_editor_t;
+} EMAccountEditorType;
 
 struct _EMAccountEditor {
-	GObject gobject;
+	GObject parent;
 
 	EMAccountEditorPrivate *priv;
 
-	em_account_editor_t type;
-	GtkWidget *editor; /* gtknotebook or druid, depending on type */
+	EMAccountEditorType type;
+	GtkWidget *editor; /* gtknotebook or gtkassistant, depending on type */
 
 	EMConfig *config; /* driver object */
 
-	EAccount *account; /* working account, must instant apply to this */
-	EAccount *original; /* original account, not changed unless commit is invoked */
-
 	GtkWidget **pages; /* Pages for Anjal's page type editor */
 
 	guint do_signature:1;	/* allow editing signature */
 };
 
 struct _EMAccountEditorClass {
-	GObjectClass gobject_class;
+	GObjectClass parent_class;
 };
 
-GType em_account_editor_get_type(void);
-
-EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, const gchar *id);
-EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_editor_t type, gchar *id, GtkWidget **pages);
-void em_account_editor_commit (EMAccountEditor *emae);
-gboolean em_account_editor_check (EMAccountEditor *emae, const gchar *page);
-
-gboolean em_account_editor_save (EMAccountEditor *gui);
-void em_account_editor_destroy (EMAccountEditor *gui);
-
-gboolean em_account_editor_identity_complete (EMAccountEditor *gui, GtkWidget **incomplete);
-gboolean em_account_editor_source_complete (EMAccountEditor *gui, GtkWidget **incomplete);
-gboolean em_account_editor_transport_complete (EMAccountEditor *gui, GtkWidget **incomplete);
-gboolean em_account_editor_management_complete (EMAccountEditor *gui, GtkWidget **incomplete);
-
-void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url);
-
-void em_account_editor_auto_detect_extra_conf (EMAccountEditor *gui);
+GType		em_account_editor_get_type	(void);
+EMAccountEditor *
+		em_account_editor_new		(EAccount *account,
+						 EMAccountEditorType type,
+						 const gchar *id);
+EMAccountEditor *
+		em_account_editor_new_for_pages	(EAccount *account,
+						 EMAccountEditorType type,
+						 const gchar *id,
+						 GtkWidget **pages);
+EAccount *	em_account_editor_get_modified_account
+						(EMAccountEditor *emae);
+EAccount *	em_account_editor_get_original_account
+						(EMAccountEditor *emae);
+void		em_account_editor_commit	(EMAccountEditor *emae);
+gboolean	em_account_editor_check		(EMAccountEditor *emae,
+						 const gchar *page);
+gboolean	em_account_editor_save		(EMAccountEditor *emae);
+void		em_account_editor_destroy	(EMAccountEditor *emae);
+gboolean	em_account_editor_identity_complete
+						(EMAccountEditor *emae,
+						 GtkWidget **incomplete);
+gboolean	em_account_editor_source_complete
+						(EMAccountEditor *emae,
+						 GtkWidget **incomplete);
+gboolean	EMAccountEditorTyperansport_complete
+						(EMAccountEditor *emae,
+						 GtkWidget **incomplete);
+gboolean	em_account_editor_management_complete
+						(EMAccountEditor *emae,
+						 GtkWidget **incomplete);
+void		em_account_editor_build_extra_conf
+						(EMAccountEditor *emae,
+						 const gchar *url);
+void		em_account_editor_auto_detect_extra_conf
+						(EMAccountEditor *emae);
 
 G_END_DECLS