1 files changed, 64 insertions, 67 deletions

diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h
index 549cb151e1..2b47039c77 100644
--- a/mail/mail-account-gui.h
+++ b/mail/mail-account-gui.h
@@ -30,111 +30,108 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <glade/glade-xml.h>
 #include <camel/camel-provider.h>
 
-#include "mail-config.h"
-#include "em-account-prefs.h"
-
-typedef struct {
-	GtkWidget *container;
-
-	GtkOptionMenu *type;
-	GtkLabel *description;
-	GtkEntry *hostname;
-	GtkEntry *username;
-	GtkEntry *path;
-	GtkWidget *ssl_frame;
-	GtkOptionMenu *use_ssl;
-	GtkWidget *ssl_selected;
-	GtkWidget *ssl_hbox;
-	GtkWidget *no_ssl;
-	GtkOptionMenu *authtype;
-	GtkWidget *authitem;
-	GtkToggleButton *remember;
-	GtkButton *check_supported;
+struct _EAccount;
+struct _EMAccountPrefs;
+
+typedef struct _MailAccountGuiService {
+	struct _GtkWidget *container;
+
+	struct _GtkOptionMenu *type;
+	struct _GtkLabel *description;
+	struct _GtkEntry *hostname;
+	struct _GtkEntry *username;
+	struct _GtkEntry *path;
+	struct _GtkWidget *ssl_frame;
+	struct _GtkOptionMenu *use_ssl;
+	struct _GtkWidget *ssl_selected;
+	struct _GtkWidget *ssl_hbox;
+	struct _GtkWidget *no_ssl;
+	struct _GtkOptionMenu *authtype;
+	struct _GtkWidget *authitem;
+	struct _GtkToggleButton *remember;
+	struct _GtkButton *check_supported;
 	
 	CamelProvider *provider;
 	CamelProviderType provider_type;
 } MailAccountGuiService;
 
-typedef struct {
-	EAccount *account;
-	EMAccountPrefs *dialog;
-	GladeXML *xml;
+typedef struct _MailAccountGui {
+	struct _EAccount *account;
+	struct _EMAccountPrefs *dialog;
+	struct _GladeXML *xml;
 	
 	/* identity */
-	GtkEntry *full_name;
-	GtkEntry *email_address;
-	GtkEntry *reply_to;
-	GtkEntry *organization;
+	struct _GtkEntry *full_name;
+	struct _GtkEntry *email_address;
+	struct _GtkEntry *reply_to;
+	struct _GtkEntry *organization;
 	
 	/* signatures */
-	GtkWidget *sig_option_menu;
+	struct _GtkWidget *sig_option_menu;
 	
-	MailConfigSignature *def_signature;
+	struct _MailConfigSignature *def_signature;
 	gboolean auto_signature;
 	
 	/* incoming mail */
 	MailAccountGuiService source;
-	GtkToggleButton *source_auto_check;
-	GtkSpinButton *source_auto_check_min;
+	struct _GtkToggleButton *source_auto_check;
+	struct _GtkSpinButton *source_auto_check_min;
 	
 	/* extra incoming config */
 	GHashTable *extra_config;
 	
 	/* outgoing mail */
 	MailAccountGuiService transport;
-	GtkToggleButton *transport_needs_auth;
+	struct _GtkToggleButton *transport_needs_auth;
 	
 	/* account management */
-	GtkEntry *account_name;
-	GtkToggleButton *default_account;
+	struct _GtkEntry *account_name;
+	struct _GtkToggleButton *default_account;
 	
 	/* special folders */
-	GtkButton *drafts_folder_button;
+	struct _GtkButton *drafts_folder_button;
 	char *drafts_folder_uri;
-	GtkButton *sent_folder_button;
+	struct _GtkButton *sent_folder_button;
 	char *sent_folder_uri;
-	GtkButton *restore_folders_button;
+	struct _GtkButton *restore_folders_button;
 
 	/* always cc/bcc */
-	GtkToggleButton *always_cc;
-	GtkEntry *cc_addrs;
-	GtkToggleButton *always_bcc;
-	GtkEntry *bcc_addrs;
+	struct _GtkToggleButton *always_cc;
+	struct _GtkEntry *cc_addrs;
+	struct _GtkToggleButton *always_bcc;
+	struct _GtkEntry *bcc_addrs;
 	
 	/* Security */
-	GtkEntry *pgp_key;
-	GtkToggleButton *pgp_encrypt_to_self;
-	GtkToggleButton *pgp_always_sign;
-	GtkToggleButton *pgp_no_imip_sign;
-	GtkToggleButton *pgp_always_trust;
-
-	GtkToggleButton *smime_sign_default;
-	GtkEntry *smime_sign_key;
-	GtkButton *smime_sign_key_select;
-	GtkButton *smime_sign_key_clear;
-	GtkButton *smime_sign_select;
-	GtkToggleButton *smime_encrypt_default;
-	GtkToggleButton *smime_encrypt_to_self;
-	GtkEntry *smime_encrypt_key;
-	GtkButton *smime_encrypt_key_select;
-	GtkButton *smime_encrypt_key_clear;
+	struct _GtkEntry *pgp_key;
+	struct _GtkToggleButton *pgp_encrypt_to_self;
+	struct _GtkToggleButton *pgp_always_sign;
+	struct _GtkToggleButton *pgp_no_imip_sign;
+	struct _GtkToggleButton *pgp_always_trust;
+
+	struct _GtkToggleButton *smime_sign_default;
+	struct _GtkEntry *smime_sign_key;
+	struct _GtkButton *smime_sign_key_select;
+	struct _GtkButton *smime_sign_key_clear;
+	struct _GtkButton *smime_sign_select;
+	struct _GtkToggleButton *smime_encrypt_default;
+	struct _GtkToggleButton *smime_encrypt_to_self;
+	struct _GtkEntry *smime_encrypt_key;
+	struct _GtkButton *smime_encrypt_key_select;
+	struct _GtkButton *smime_encrypt_key_clear;
 } MailAccountGui;
 
 
-MailAccountGui *mail_account_gui_new (EAccount *account, EMAccountPrefs *dialog);
-void mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top);
+MailAccountGui *mail_account_gui_new (struct _EAccount *account, struct _EMAccountPrefs *dialog);
+void mail_account_gui_setup (MailAccountGui *gui, struct _GtkWidget *top);
 gboolean mail_account_gui_save (MailAccountGui *gui);
 void mail_account_gui_destroy (MailAccountGui *gui);
 
-gboolean mail_account_gui_identity_complete (MailAccountGui *gui, GtkWidget **incomplete);
-gboolean mail_account_gui_source_complete (MailAccountGui *gui, GtkWidget **incomplete);
-gboolean mail_account_gui_transport_complete (MailAccountGui *gui, GtkWidget **incomplete);
-gboolean mail_account_gui_management_complete (MailAccountGui *gui, GtkWidget **incomplete);
+gboolean mail_account_gui_identity_complete (MailAccountGui *gui, struct _GtkWidget **incomplete);
+gboolean mail_account_gui_source_complete (MailAccountGui *gui, struct _GtkWidget **incomplete);
+gboolean mail_account_gui_transport_complete (MailAccountGui *gui, struct _GtkWidget **incomplete);
+gboolean mail_account_gui_management_complete (MailAccountGui *gui, struct _GtkWidget **incomplete);
 
 void mail_account_gui_build_extra_conf (MailAccountGui *gui, const char *url);