Cleaned up header inclusions and added plenty of forward declarations.

2004-03-31  Not Zed  <NotZed@Ximian.com>

        * *.[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  <NotZed@Ximian.com>

        * 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

1 files changed, 31 insertions, 31 deletions

diff --git a/mail/mail-config.h b/mail/mail-config.h
index 36891eccb4..67ae283b72 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -23,22 +23,26 @@
 #ifndef MAIL_CONFIG_H
 #define MAIL_CONFIG_H
 
-#include <gtk/gtk.h>
+#include <glib.h>
+#include <glib-object.h>
 
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
+#include "camel/camel-provider.h" /* can't forward-declare enums, bah */
 
-#include <camel/camel.h>
+struct _EAccount;
+struct _EAccountList;
+struct _EAccountService;
 
-#include "e-util/e-account.h"
-#include "e-util/e-account-list.h"
+struct _GConfClient;
+struct _GtkWindow;
+
+struct _CamelFolder;
 
 #ifdef __cplusplus
 extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-typedef struct {
+typedef struct _MailConfigSignature {
 	int id;
 	char *name;
 	char *filename;
@@ -104,7 +108,7 @@ void mail_config_clear (void);
 void mail_config_write (void);
 void mail_config_write_on_exit (void);
 
-GConfClient *mail_config_get_gconf_client (void);
+struct _GConfClient *mail_config_get_gconf_client (void);
 
 /* General Accessor functions */
 gboolean mail_config_is_configured            (void);
@@ -116,22 +120,22 @@ const char *mail_config_get_label_color_by_index (int index);
 
 const char **mail_config_get_allowable_mime_types (void);
 
-void mail_config_service_set_save_passwd (EAccountService *service, gboolean save_passwd);
+void mail_config_service_set_save_passwd (struct _EAccountService *service, gboolean save_passwd);
 
-gboolean      mail_config_find_account                 (EAccount *account);
-EAccount     *mail_config_get_default_account          (void);
-EAccount     *mail_config_get_account_by_name          (const char *account_name);
-EAccount     *mail_config_get_account_by_uid           (const char *uid);
-EAccount     *mail_config_get_account_by_source_url    (const char *url);
-EAccount     *mail_config_get_account_by_transport_url (const char *url);
-EAccountList *mail_config_get_accounts                 (void);
-void          mail_config_add_account                  (EAccount *account);
-void          mail_config_remove_account               (EAccount *account);
+gboolean      mail_config_find_account                 (struct _EAccount *account);
+struct _EAccount     *mail_config_get_default_account          (void);
+struct _EAccount     *mail_config_get_account_by_name          (const char *account_name);
+struct _EAccount     *mail_config_get_account_by_uid           (const char *uid);
+struct _EAccount     *mail_config_get_account_by_source_url    (const char *url);
+struct _EAccount     *mail_config_get_account_by_transport_url (const char *url);
+struct _EAccountList *mail_config_get_accounts                 (void);
+void          mail_config_add_account                  (struct _EAccount *account);
+void          mail_config_remove_account               (struct _EAccount *account);
 
-void          mail_config_set_default_account          (EAccount *account);
+void          mail_config_set_default_account          (struct _EAccount *account);
 
-EAccountIdentity *mail_config_get_default_identity (void);
-EAccountService  *mail_config_get_default_transport (void);
+struct _EAccountIdentity *mail_config_get_default_identity (void);
+struct _EAccountService  *mail_config_get_default_transport (void);
 
 void mail_config_save_accounts (void);
 
@@ -143,25 +147,21 @@ void mail_config_signature_set_name     (MailConfigSignature *sig, const char *n
 void mail_config_signature_set_html     (MailConfigSignature *sig, gboolean html);
 void mail_config_signature_set_filename (MailConfigSignature *sig, const char *filename);
 
-
 /* uri's got changed by the store, etc */
 void mail_config_uri_renamed (GCompareFunc uri_cmp, const char *old, const char *new);
 void mail_config_uri_deleted (GCompareFunc uri_cmp, const char *uri);
 
-
 /* static utility functions */
-char *mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix);
-char *mail_config_folder_to_safe_url (CamelFolder *folder);
+char *mail_config_folder_to_cachename (struct _CamelFolder *folder, const char *prefix);
+char *mail_config_folder_to_safe_url (struct _CamelFolder *folder);
 
-gboolean mail_config_check_service (const char *url, CamelProviderType type, GList **authtypes, GtkWindow *window);
+/* Ugh, this totally does not belong in this module */
+gboolean mail_config_check_service (const char *url, CamelProviderType type, GList **authtypes, struct _GtkWindow *window);
 
-
-
-GtkType evolution_mail_config_get_type (void);
+GType evolution_mail_config_get_type (void);
 
 gboolean evolution_mail_config_factory_init (void);
 
-
 typedef enum {
 	MAIL_CONFIG_SIG_EVENT_NAME_CHANGED,
 	MAIL_CONFIG_SIG_EVENT_CONTENT_CHANGED,
@@ -176,7 +176,7 @@ void mail_config_signature_register_client (MailConfigSignatureClient client, gp
 void mail_config_signature_unregister_client (MailConfigSignatureClient client, gpointer data);
 void mail_config_signature_emit_event (MailConfigSigEvent event, MailConfigSignature *sig);
 
-void mail_config_write_account_sig (EAccount *account, int i);
+void mail_config_write_account_sig (struct _EAccount *account, int i);
 char *mail_config_signature_run_script (char *script);
 
 #ifdef __cplusplus