From 9e126a8d01dd36a19ab34a9d3edf016897b12d7e Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 31 Mar 2004 10:09:04 +0000 Subject: Cleaned up header inclusions and added plenty of forward declarations. 2004-03-31 Not Zed * *.[ch]: Cleaned up header inclusions and added plenty of forward declarations. Sped up complete re-compilation by upto 20%. ** See bug #55950. * em-utils.c (em_utils_in_addressbook): utility for checking if an email address is in the addressbook. I can't tell if it works 'cause it crashes eds. * em-format-html.c (emfh_gethttp): handle addressbook checking. 2004-03-30 Not Zed * mail-config.h: clean up the headers and use some forward decl's instead. * em-format-html.c (em_format_html_set_load_http): change state to an int 'style' instead. * em-folder-view.c (emfv_setting_notify): set the format load http option to the config value directly. ** See bug #56147. * message-list.c (clear_info): set the node data to NULL when we unref its data. (ml_get_save_id): use a different test for the root node, and return NULL if we don't have any data on the node (because we're cleaing it). ** See bug #54962. * em-folder-tree.c (emft_popup_new_folder_response): put back the old hack to open the vfolder editor if you try to create a folder under vfolders. ** See bug #55940. * mail-autofilter.c (mail_filter_rename_uri): map the uri to an email uri before passing to filter code. (mail_filter_delete_uri): same here. svn path=/trunk/; revision=25261 --- mail/mail-account-gui.h | 131 +++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 67 deletions(-) (limited to 'mail/mail-account-gui.h') 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 -#include -#include #include -#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); -- cgit v1.2.3