From e0053bce8e3e5e7f18bea009f3bbfb1e51234f65 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 17 Jan 2003 23:31:27 +0000 Subject: Updated. (request_password): Same. 2003-01-17 Jeffrey Stedfast * mail-session.c (do_get_pass): Updated. (request_password): Same. * mail-send-recv.c (mail_send): Fixed to use EAccountService. * mail-config-druid.c (make_account): Updated to use EAccount and friends. * mail-account-gui.c (service_check_supported): Updated to use EAccountService. (mail_account_gui_new): Ref the account passed in and also update to use EAccount objects. (save_service): Updated to use an EAccountService. (add_new_store): Updated to use an EAccount. (mail_account_gui_save): Updated to use EAccounts. (setup_signatures): Updated because the new account->id->def_sig is now an int and not a structure pointer. * mail-account-editor.c (construct): Updated. (mail_account_editor_new): Now takes an EAccount object as an argument instead of a MailConfigAccount. * mail-crypto.c (mail_crypto_get_pgp_cipher_context): Updated to use EAccounts. * subscribe-dialog.c (populate_store_foreach): Removed. (populate_store_list): Can't use populate_store_foreach here because of the change to EAccountList so do it manually. * mail-vfolder.c (uri_is_ignore): Rewrote to use EAccountList and EIterator and all that fun. * mail-send-recv.c (build_dialogue): Updated to use EAccountList and EAccount object stuff. *ugh* (mail_send_receive): Here too. (mail_autoreceive_setup): Same. * mail-callbacks.c (check_send_configuration): Updated. (composer_get_message): Updated. (compose_msg): " (list_add_addresses): " (guess_me): " (guess_me_from_accounts): Same. (forward_get_composer): Here too. (mail_generate_reply): Same. (redirect_get_composer): " (empty_trash): And finally here. * mail-accounts.c (account_edit_clicked): Updated. (account_delete_clicked): Same. (account_default_clicked): Here too. (account_able_clicked): " (account_cursor_change): " (mail_accounts_load): Again here. * folder-browser.c (folder_browser_is_drafts): Updated to use EAccountList and EAccount stuff. (folder_browser_is_sent): Same. * component-factory.c (mail_load_storages): Updated to use EAccount and EAccountList stuff. (owner_set_cb): Same. (send_receive_cb): Here too. * mail-config.c: Rewritten to use EAccount and EAccountList objects. svn path=/trunk/; revision=19509 --- mail/mail-config.h | 112 ++++++++++++++--------------------------------------- 1 file changed, 29 insertions(+), 83 deletions(-) (limited to 'mail/mail-config.h') diff --git a/mail/mail-config.h b/mail/mail-config.h index 239a6d2feb..6f990b7a6d 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -26,6 +26,9 @@ #include #include +#include "e-util/e-account.h" +#include "e-util/e-account-list.h" + #ifdef __cplusplus extern "C" { #pragma } @@ -39,51 +42,6 @@ typedef struct { gboolean html; } MailConfigSignature; -typedef struct { - char *name; - char *address; - char *reply_to; - char *organization; - - MailConfigSignature *def_signature; - gboolean auto_signature; -} MailConfigIdentity; - -typedef struct { - char *url; - gboolean keep_on_server; - gboolean auto_check; - int auto_check_time; - gboolean save_passwd; -} MailConfigService; - -typedef struct { - char *name; - char *uid; - - gboolean enabled; - - MailConfigIdentity *id; - MailConfigService *source; - MailConfigService *transport; - - char *drafts_folder_uri, *sent_folder_uri; - - gboolean always_cc; - char *cc_addrs; - gboolean always_bcc; - char *bcc_addrs; - - char *pgp_key; - gboolean pgp_encrypt_to_self; - gboolean pgp_always_sign; - gboolean pgp_no_imip_sign; - gboolean pgp_always_trust; - - char *smime_key; - gboolean smime_encrypt_to_self; - gboolean smime_always_sign; -} MailConfigAccount; typedef enum { MAIL_CONFIG_HTTP_NEVER, @@ -135,20 +93,6 @@ extern MailConfigLabel label_defaults[5]; MailConfigSignature *signature_copy (const MailConfigSignature *sig); void signature_destroy (MailConfigSignature *sig); -/* Identities */ -MailConfigIdentity *identity_copy (const MailConfigIdentity *id); -void identity_destroy (MailConfigIdentity *id); - -/* Services */ -MailConfigService *service_copy (const MailConfigService *source); -void service_destroy (MailConfigService *source); -void service_destroy_each (gpointer item, gpointer data); - -/* Accounts */ -MailConfigAccount *account_copy (const MailConfigAccount *account); -void account_destroy (MailConfigAccount *account); -void account_destroy_each (gpointer item, gpointer data); - /* Configuration */ void mail_config_init (void); void mail_config_clear (void); @@ -168,30 +112,37 @@ guint32 mail_config_get_label_color (int label); void mail_config_set_label_color (int label, guint32 color); const char *mail_config_get_label_color_string (int label); -void mail_config_service_set_save_passwd (MailConfigService *service, gboolean save_passwd); +void mail_config_service_set_save_passwd (EAccountService *service, gboolean save_passwd); -gboolean mail_config_find_account (const MailConfigAccount *account); -const MailConfigAccount *mail_config_get_default_account (void); -const MailConfigAccount *mail_config_get_account_by_name (const char *account_name); -const MailConfigAccount *mail_config_get_account_by_source_url (const char *url); -const MailConfigAccount *mail_config_get_account_by_transport_url (const char *url); -const GSList *mail_config_get_accounts (void); -void mail_config_add_account (MailConfigAccount *account); -const GSList *mail_config_remove_account (MailConfigAccount *account); +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_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); -void mail_config_set_default_account (const MailConfigAccount *account); +void mail_config_set_default_account (EAccount *account); -const MailConfigIdentity *mail_config_get_default_identity (void); -const MailConfigService *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); -/* 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); +GSList *mail_config_get_signature_list (void); +MailConfigSignature *mail_config_signature_add (gboolean html, const char *script); +void mail_config_signature_delete (MailConfigSignature *sig); +void mail_config_signature_write (MailConfigSignature *sig); +void mail_config_signature_set_name (MailConfigSignature *sig, const char *name); +void mail_config_signature_set_html (MailConfigSignature *sig, gboolean html); +void mail_config_signature_set_filename (MailConfigSignature *sig, const char *filename); -GtkType evolution_mail_config_get_type (void); +/* 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); @@ -201,15 +152,10 @@ gboolean mail_config_check_service (const char *url, CamelProviderType type, GLi +GtkType evolution_mail_config_get_type (void); + gboolean evolution_mail_config_factory_init (void); -GSList *mail_config_get_signature_list (void); -MailConfigSignature *mail_config_signature_add (gboolean html, const gchar *script); -void mail_config_signature_delete (MailConfigSignature *sig); -void mail_config_signature_write (MailConfigSignature *sig); -void mail_config_signature_set_name (MailConfigSignature *sig, const gchar *name); -void mail_config_signature_set_html (MailConfigSignature *sig, gboolean html); -void mail_config_signature_set_filename (MailConfigSignature *sig, const gchar *filename); typedef enum { MAIL_CONFIG_SIG_EVENT_NAME_CHANGED, @@ -225,7 +171,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 (MailConfigAccount *account, int i); +void mail_config_write_account_sig (EAccount *account, int i); char *mail_config_signature_run_script (char *script); #ifdef __cplusplus -- cgit