[evolution/express] Integrate account assistant wizard to anjal style.

[Srinivasa Ragavan <sragavan src gnome org>]

commit eac5630394fe7b16aef56d1fa2e742e9dfae9426
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Mon Mar 1 14:57:24 2010 +0530

    Integrate account assistant wizard to anjal style.

 capplet/anjal-settings-main.c           |    2 +-
 capplet/mail-capplet-shell.c            |   22 +++++++++++++---------
 capplet/mail-capplet-shell.h            |    2 +-
 plugins/startup-wizard/startup-wizard.c |    2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 80943f5..1b7fe0d 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -158,7 +158,7 @@ idle_cb (MailCappletShell *mshell G_GNUC_UNUSED)
 static void
 create_default_shell (void)
 {
-	main_window = mail_capplet_shell_new(socket_id);
+	main_window = mail_capplet_shell_new(socket_id, FALSE);
 	if (!socket_id)
 		gtk_widget_show (main_window);
 	g_idle_add ((GSourceFunc) idle_cb, remaining_args);
diff --git a/capplet/mail-capplet-shell.c b/capplet/mail-capplet-shell.c
index 5e2cce6..ae30f2f 100644
--- a/capplet/mail-capplet-shell.c
+++ b/capplet/mail-capplet-shell.c
@@ -261,7 +261,7 @@ handle_cmdline (MailView *mv, MailCappletShell *shell)
 #endif
 
 void
-mail_capplet_shell_construct (MailCappletShell *shell, int socket_id)
+mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean just_druid)
 {
 	MailCappletShellPrivate *priv = shell->priv;
 	GtkWidget *tmp, *img, *box, *ar1, *ar2, *lbl;
@@ -270,6 +270,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id)
 	char *custom_dir;
 
 	gtk_window_set_icon_name ((GtkWindow *)shell, "evolution");
+	gtk_window_set_title ((GtkWindow *)shell, _("Evolution account assistant"));
 	ms_init_style (style);
 	g_signal_connect ((GObject *)shell, "delete-event", G_CALLBACK (ms_delete_event), NULL);
 	gtk_window_set_type_hint ((GtkWindow *)shell, GDK_WINDOW_TYPE_HINT_NORMAL);
@@ -279,7 +280,8 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id)
 		 gtk_window_set_default_size ((GtkWindow *)shell, gdk_screen_get_width(scr), gdk_screen_get_height (scr));
 		 gtk_window_set_decorated ((GtkWindow *)shell, FALSE);
 	} else  {
-		mail_decoration_new ((GtkWindow *)shell);
+		//mail_decoration_new ((GtkWindow *)shell);
+		gtk_window_set_default_size ((GtkWindow *)shell, 1024, 500);
 	}
 
 
@@ -287,6 +289,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id)
 	gtk_widget_show ((GtkWidget *)priv->box);
 
 	if (!socket_id) {
+#if 0
 		/* Toolbar */
 		priv->top_bar = gtk_toolbar_new ();
 		gtk_box_pack_start ((GtkBox *)priv->box, priv->top_bar, FALSE, FALSE, 0);
@@ -322,7 +325,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id)
 		gtk_toolbar_insert ((GtkToolbar *)priv->top_bar, (GtkToolItem *)priv->quit, -1);
 		gtk_widget_show_all (priv->quit);
 		g_signal_connect (priv->quit, "clicked", G_CALLBACK(mail_capplet_shell_quit_cb), shell);
-
+#endif
 		gtk_container_add ((GtkContainer *)shell, priv->box);
 	} else {
 		GtkWidget *plug = gtk_plug_new (socket_id);
@@ -347,10 +350,11 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id)
 	e_mail_store_init (custom_dir);
 	g_free (custom_dir);
 	
-	if (TRUE) {
+	if (just_druid) {
 		MailViewChild *mc;
 		char *pdir = g_build_filename (g_get_home_dir(), ".gnome2_private", NULL);
-
+		
+		gtk_notebook_set_show_tabs ((GtkNotebook *)shell->view, FALSE);
 		mc = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_ACCOUNT, NULL);
 		g_signal_connect (mc, "view-close", G_CALLBACK(ms_show_post_druid), shell);
 		setup_abooks ();
@@ -358,9 +362,9 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id)
 			g_mkdir (pdir, 0700);
 		}
 		g_free (pdir);
-	} /*else 
+	} else 
 		shell->priv->settings_view = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_SETTINGS, NULL);
-	*/
+	
 
 }
 
@@ -371,10 +375,10 @@ mail_capplet_shell_toolbar_height (MailCappletShell *shell)
 }
 
 MailCappletShell *
-mail_capplet_shell_new (int socket_id)
+mail_capplet_shell_new (int socket_id, gboolean just_druid)
 {
 	MailCappletShell *shell = g_object_new (MAIL_CAPPLET_SHELL_TYPE, NULL);
-	mail_capplet_shell_construct (shell, socket_id);
+	mail_capplet_shell_construct (shell, socket_id, just_druid);
 
 	return shell;
 }
diff --git a/capplet/mail-capplet-shell.h b/capplet/mail-capplet-shell.h
index be6ba25..ab33850 100644
--- a/capplet/mail-capplet-shell.h
+++ b/capplet/mail-capplet-shell.h
@@ -50,7 +50,7 @@ typedef struct _MailCappletShellClass {
 	void (* ctrl_q_pressed)    (MailCappletShell *class);	
 } MailCappletShellClass;
 
-MailCappletShell * mail_capplet_shell_new (int socket_id);
+MailCappletShell * mail_capplet_shell_new (int socket_id, gboolean just_druid);
 int mail_capplet_shell_toolbar_height (MailCappletShell *shell);
 
 #endif
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index a9ef617..c8513f0 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -79,7 +79,7 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target)
 		return;
 	}
 
-	start_page = (GtkWidget *)mail_capplet_shell_new(0);
+	start_page = (GtkWidget *)mail_capplet_shell_new(0, TRUE);
 	gtk_widget_show (start_page);
 	g_signal_connect (
 		start_page, "delete-event",