From ef6a3af717132e0750f226fa8a0ee0f3c98e19f0 Mon Sep 17 00:00:00 2001 From: Michael Zucci Date: Mon, 20 Sep 2004 05:59:55 +0000 Subject: Merged notzed-eplugin-2-branch to head. svn path=/trunk/; revision=27300 --- mail/em-utils.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'mail/em-utils.c') diff --git a/mail/em-utils.c b/mail/em-utils.c index 8c22fe8926..2adf723f67 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -44,13 +44,13 @@ #include #include #include +#include #include "mail-component.h" #include "mail-mt.h" #include "mail-ops.h" #include "mail-tools.h" #include "mail-config.h" -#include "mail-config-druid.h" #include "message-tag-followup.h" #include @@ -63,6 +63,7 @@ #include "em-utils.h" #include "em-composer-utils.h" #include "em-format-quote.h" +#include "em-account-editor.h" static void emu_save_part_done (CamelMimePart *part, char *name, int done, void *data); @@ -178,19 +179,18 @@ druid_destroy_cb (gpointer user_data, GObject *deadbeef) gboolean em_utils_configure_account (GtkWidget *parent) { - MailConfigDruid *druid; - - druid = mail_config_druid_new (); - + EMAccountEditor *emae; + + emae = em_account_editor_new(NULL, EMAE_DRUID); if (parent != NULL) - e_dialog_set_transient_for ((GtkWindow *) druid, parent); - - g_object_weak_ref ((GObject *) druid, (GWeakNotify) druid_destroy_cb, NULL); - gtk_widget_show ((GtkWidget *) druid); - gtk_grab_add ((GtkWidget *) druid); - gtk_main (); + e_dialog_set_transient_for((GtkWindow *)emae->editor, parent); + + g_object_weak_ref((GObject *)emae->editor, (GWeakNotify) druid_destroy_cb, NULL); + gtk_widget_show(emae->editor); + gtk_grab_add(emae->editor); + gtk_main(); - return mail_config_is_configured (); + return mail_config_is_configured(); } /** -- cgit v1.2.3