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-accounts.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'mail/mail-accounts.c') diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index 21ce6dd6cc..afcc22f83b 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -168,8 +168,8 @@ account_edit_clicked (GtkButton *button, gpointer user_data) MailAccountsTab *prefs = (MailAccountsTab *) user_data; if (prefs->editor == NULL) { - MailConfigAccount *account = NULL; GtkTreeSelection *selection; + EAccount *account = NULL; GtkTreeModel *model; GtkTreeIter iter; @@ -195,11 +195,11 @@ static void account_delete_clicked (GtkButton *button, gpointer user_data) { MailAccountsTab *prefs = user_data; - const MailConfigAccount *account = NULL; GtkTreeSelection *selection; + EAccount *account = NULL; + EAccountList *accounts; GtkTreeModel *model; GtkWidget *confirm; - const GSList *list; GtkTreeIter iter; int ans; @@ -238,7 +238,8 @@ account_delete_clicked (GtkButton *button, gpointer user_data) mail_remove_storage_by_uri (account->source->url); /* remove it from the config file */ - list = mail_config_remove_account ((MailConfigAccount *) account); + mail_config_remove_account (account); + accounts = mail_config_get_accounts (); mail_config_write (); @@ -246,7 +247,7 @@ account_delete_clicked (GtkButton *button, gpointer user_data) gtk_list_store_remove ((GtkListStore *) model, &iter); - len = list ? g_slist_length ((GSList *) list) : 0; + len = e_list_length ((EList *) accounts); if (len > 0) { gtk_tree_selection_select_iter (selection, &iter); } else { @@ -262,8 +263,8 @@ static void account_default_clicked (GtkButton *button, gpointer user_data) { MailAccountsTab *prefs = user_data; - const MailConfigAccount *account = NULL; GtkTreeSelection *selection; + EAccount *account = NULL; GtkTreeModel *model; GtkTreeIter iter; int row; @@ -285,8 +286,8 @@ static void account_able_clicked (GtkButton *button, gpointer user_data) { MailAccountsTab *prefs = user_data; - MailConfigAccount *account = NULL; GtkTreeSelection *selection; + EAccount *account = NULL; GtkTreeModel *model; GtkTreeIter iter; @@ -295,8 +296,8 @@ account_able_clicked (GtkButton *button, gpointer user_data) gtk_tree_model_get (model, &iter, 3, &account, -1); account->enabled = !account->enabled; gtk_list_store_set ((GtkListStore *) model, &iter, 0, account->enabled, -1); - - gtk_button_set_label (prefs->mail_able, account->enabled?_("Disable"):_("Enable")); + + gtk_button_set_label (prefs->mail_able, account->enabled ? _("Disable") : _("Enable")); } if (account) { @@ -325,7 +326,7 @@ account_double_click (GtkTreeView *treeview, GtkTreePath *path, static void account_cursor_change (GtkTreeSelection *selection, MailAccountsTab *prefs) { - const MailConfigAccount *account; + EAccount *account = NULL; GtkTreeModel *model; GtkTreeIter iter; int state; @@ -350,11 +351,12 @@ account_cursor_change (GtkTreeSelection *selection, MailAccountsTab *prefs) static void mail_accounts_load (MailAccountsTab *prefs) { - const MailConfigAccount *default_account; + EAccount *default_account; + EAccountList *accounts; GtkListStore *model; - const GSList *node; GtkTreeIter iter; char *name, *val; + EIterator *node; int row = 0; model = (GtkListStore *) gtk_tree_view_get_model (prefs->table); @@ -362,12 +364,13 @@ mail_accounts_load (MailAccountsTab *prefs) default_account = mail_config_get_default_account (); - node = mail_config_get_accounts (); - while (node) { - const MailConfigAccount *account; + accounts = mail_config_get_accounts (); + node = e_list_get_iterator ((EList *) accounts); + while (e_iterator_is_valid (node)) { + EAccount *account; CamelURL *url; - account = node->data; + account = (EAccount *) e_iterator_get (node); url = account->source && account->source->url ? camel_url_new (account->source->url, NULL) : NULL; @@ -391,9 +394,12 @@ mail_accounts_load (MailAccountsTab *prefs) if (url) camel_url_free (url); - node = node->next; row++; + + e_iterator_next (node); } + + g_object_unref (node); } -- cgit v1.2.3