From 02cbfd837abaf8ec1218cc97f7fed70cbd1fdf7e Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 16 Feb 2012 10:57:40 +0000 Subject: Make Capplet work again with new CamelSettings and other stuffs. Also add EPlugin support to capplet so that exchange and other accoutns can be configured via this. now. --- mail/em-account-editor.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'mail/em-account-editor.c') diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index b2759f3ad9..d2ff491b82 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -3043,7 +3043,10 @@ emae_identity_page (EConfig *ec, w = e_builder_get_widget (builder, item->label); if (emae->type == EMAE_PAGES) { + GtkWidget *page = emae_create_basic_assistant_page (emae, GTK_ASSISTANT (parent), "identity_page", position); + gtk_box_pack_start ((GtkBox *) emae->pages[0], w, TRUE, TRUE, 0); + w = page; } else if (((EConfig *) priv->config)->type == E_CONFIG_ASSISTANT) { GtkWidget *page; @@ -3102,7 +3105,21 @@ emae_receive_page (EConfig *ec, w = e_builder_get_widget (builder, item->label); if (emae->type == EMAE_PAGES) { - gtk_box_pack_start ((GtkBox *) emae->pages[1], w, TRUE, TRUE, 0); + GtkWidget *page = emae_create_basic_assistant_page (emae, GTK_ASSISTANT (parent), "source_page", position); + GtkWidget *vbox, *child; + + child = (GtkWidget *)g_object_get_data ((GObject *)emae->pages[1], "old-child"); + if (child) + gtk_container_remove ((GtkContainer *)emae->pages[1], child); + + vbox = gtk_vbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); + gtk_widget_show (vbox); + gtk_box_pack_start ((GtkBox *)vbox, w, TRUE, TRUE, 0); + g_object_set_data ((GObject *)emae->pages[1], "old-child", vbox); + gtk_box_pack_start ((GtkBox *)emae->pages[1], vbox, TRUE, TRUE, 0); + + w = page; } else if (((EConfig *) priv->config)->type == E_CONFIG_ASSISTANT) { GtkWidget *page; @@ -3706,7 +3723,22 @@ emae_send_page (EConfig *ec, w = e_builder_get_widget (builder, item->label); if (emae->type == EMAE_PAGES) { - gtk_box_pack_start ((GtkBox *) emae->pages[3], w, TRUE, TRUE, 0); + GtkWidget *page = emae_create_basic_assistant_page (emae, GTK_ASSISTANT (parent), "transport_page", position); + GtkWidget *vbox, *child; + + child = (GtkWidget *)g_object_get_data ((GObject *)emae->pages[3], "old-child"); + if (child) + gtk_container_remove ((GtkContainer *)emae->pages[3], child); + + vbox = gtk_vbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); + gtk_widget_show (vbox); + gtk_box_pack_start ((GtkBox *)vbox, w, TRUE, TRUE, 0); + g_object_set_data ((GObject *)emae->pages[3], "old-child", vbox); + + gtk_box_pack_start ((GtkBox *)emae->pages[3], vbox, TRUE, TRUE, 0); + + w = page; } else if (((EConfig *) priv->config)->type == E_CONFIG_ASSISTANT) { GtkWidget *page; -- cgit v1.2.3