aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-config.h
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mail-config.h')
-rw-r--r--mail/mail-config.h71
1 files changed, 31 insertions, 40 deletions
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 8ebb3dc78c..0b431537bd 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -23,22 +23,13 @@
#ifndef MAIL_CONFIG_H
#define MAIL_CONFIG_H
-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <camel/camel-provider.h>
+#include <libedataserver/e-account.h>
+#include <libedataserver/e-account-list.h>
-#include "camel/camel-provider.h" /* can't forward-declare enums, bah */
-
-struct _EAccount;
-struct _EAccountList;
-struct _EAccountService;
-
-struct _ESignature;
-struct _ESignatureList;
-
-struct _GConfClient;
-struct _GtkWindow;
-
-struct _CamelFolder;
+#include <e-util/e-signature.h>
+#include <e-util/e-signature-list.h>
G_BEGIN_DECLS
@@ -90,7 +81,7 @@ void mail_config_clear (void);
void mail_config_write (void);
void mail_config_write_on_exit (void);
-struct _GConfClient *mail_config_get_gconf_client (void);
+GConfClient *mail_config_get_gconf_client (void);
/* General Accessor functions */
gboolean mail_config_is_configured (void);
@@ -100,41 +91,41 @@ GSList *mail_config_get_labels (void);
const gchar **mail_config_get_allowable_mime_types (void);
-void mail_config_service_set_save_passwd (struct _EAccountService *service, gboolean save_passwd);
+void mail_config_service_set_save_passwd (EAccountService *service, gboolean save_passwd);
/* accounts */
-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 gchar *account_name);
-struct _EAccount *mail_config_get_account_by_uid (const gchar *uid);
-struct _EAccount *mail_config_get_account_by_source_url (const gchar *url);
-struct _EAccount *mail_config_get_account_by_transport_url (const gchar *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 (struct _EAccount *account);
+gboolean mail_config_find_account (EAccount *account);
+EAccount *mail_config_get_default_account (void);
+EAccount *mail_config_get_account_by_name (const gchar *account_name);
+EAccount *mail_config_get_account_by_uid (const gchar *uid);
+EAccount *mail_config_get_account_by_source_url (const gchar *url);
+EAccount *mail_config_get_account_by_transport_url (const gchar *url);
+
+EAccountList *mail_config_get_accounts (void);
+void mail_config_add_account (EAccount *account);
+void mail_config_remove_account (EAccount *account);
+void mail_config_set_default_account (EAccount *account);
gint mail_config_get_address_count (void);
gint mail_config_get_message_limit (void);
gboolean mail_config_get_enable_magic_spacebar (void);
-void mail_config_remove_account_proxies (struct _EAccount *account);
+void mail_config_remove_account_proxies (EAccount *account);
void mail_config_prune_proxies (void);
-gint mail_config_has_proxies (struct _EAccount *account);
+gint mail_config_has_proxies (EAccount *account);
-struct _EAccountIdentity *mail_config_get_default_identity (void);
-struct _EAccountService *mail_config_get_default_transport (void);
+EAccountIdentity *mail_config_get_default_identity (void);
+EAccountService *mail_config_get_default_transport (void);
void mail_config_save_accounts (void);
/* signatures */
-struct _ESignature *mail_config_signature_new (const gchar *filename, gboolean script, gboolean html);
-struct _ESignature *mail_config_get_signature_by_uid (const gchar *uid);
-struct _ESignature *mail_config_get_signature_by_name (const gchar *name);
+ESignature *mail_config_signature_new (const gchar *filename, gboolean script, gboolean html);
+ESignature *mail_config_get_signature_by_uid (const gchar *uid);
+ESignature *mail_config_get_signature_by_name (const gchar *name);
-struct _ESignatureList *mail_config_get_signatures (void);
-void mail_config_add_signature (struct _ESignature *signature);
-void mail_config_remove_signature (struct _ESignature *signature);
+ESignatureList *mail_config_get_signatures (void);
+void mail_config_add_signature (ESignature *signature);
+void mail_config_remove_signature (ESignature *signature);
void mail_config_save_signatures (void);
@@ -146,8 +137,8 @@ void mail_config_uri_renamed (GCompareFunc uri_cmp, const gchar *old, const gcha
void mail_config_uri_deleted (GCompareFunc uri_cmp, const gchar *uri);
/* static utility functions */
-gchar *mail_config_folder_to_cachename (struct _CamelFolder *folder, const gchar *prefix);
-gchar *mail_config_folder_to_safe_url (struct _CamelFolder *folder);
+gchar *mail_config_folder_to_cachename (CamelFolder *folder, const gchar *prefix);
+gchar *mail_config_folder_to_safe_url (CamelFolder *folder);
guint mail_config_get_error_timeout (void);
guint mail_config_get_error_level (void);