From 35139b298329ba21d3b645aa0891863bc7caaf68 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 8 Jan 2001 02:14:23 +0000 Subject: Updated to reflect changes to the mail-config API. 2001-01-07 Jeffrey Stedfast * mail-tools.c (mail_tool_quote_message): Updated to reflect changes to the mail-config API. * mail-display.c (redisplay): Updated to reflect changes to the mail-config API. * mail-callbacks.c (providers_config): Use the new account dialog. * mail-config-druid.c (druid_finish): Load the new storage into the shell. (mail_config_druid_new): Take a shell argument. * mail-format.c (mail_generate_reply): Updated to reflect changes to the mail-config API. * mail-config-druid.c: Fixed this to build. * mail-callbacks.c (check_send_configuration): Updated to reflect changes to the mail-config API. (create_msg_composer): Same. (forward_get_composer): Same. (send_queued_mail): Same. (composer_send_cb): Same. * mail-account-editor.c: Updated to build cleanly. * mail-config-druid.c: Same. * mail-accounts.c: Same. * folder-browser-factory.c (control_activate): Updated for API changes in mail-config. * folder-browser.c (done_message_selected): Updated for API changed in mail-config. (folder_browser_gui_init): Same. (got_folder): Same. * component-factory.c (owner_set_cb): After using the sources list, free it as it is no longer a const GSList as with the older mail-config code. * mail-config.c: Totally rewritten. svn path=/trunk/; revision=7298 --- mail/mail-callbacks.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'mail/mail-callbacks.c') diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index d58e208320..ab461a6b04 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -33,6 +33,8 @@ #include "mail.h" #include "mail-callbacks.h" #include "mail-config.h" +#include "mail-accounts.h" +#include "mail-config-druid.h" #include "mail-threads.h" #include "mail-tools.h" #include "mail-ops.h" @@ -65,6 +67,8 @@ struct post_send_data { static gboolean check_configured (FolderBrowser *fb) { + MailConfigDruid *druid; + if (mail_config_is_configured ()) return TRUE; @@ -83,7 +87,9 @@ check_configured (FolderBrowser *fb) switch (gnome_dialog_run_and_close (GNOME_DIALOG (dialog))) { case 0: - mail_config_druid (fb->shell); + /* FIXME: should we block until mail-config is done? */ + druid = mail_config_druid_new (fb->shell); + gtk_widget_show (GTK_WIDGET (druid)); break; case 1: default: @@ -938,7 +944,11 @@ vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path void providers_config (BonoboUIComponent *uih, void *user_data, const char *path) { - mail_config ((FOLDER_BROWSER (user_data))->shell); + /* FIXME: should we block until mail-config is done? */ + MailAccountsDialog *dialog; + + dialog = mail_accounts_dialog_new ((FOLDER_BROWSER (user_data))->shell); + gtk_widget_show (GTK_WIDGET (dialog)); } /* -- cgit v1.2.3