From a952896b27334756b349c1f6f25db6b2021aab4f Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@gnome.org>
Date: Mon, 1 Mar 2010 17:46:33 +0530
Subject: Integrate into new account button.

---
 capplet/anjal-settings-main.c |  2 +-
 capplet/mail-capplet-shell.c  | 19 +++++++++++++------
 capplet/mail-capplet-shell.h  |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'capplet')

diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 1b7fe0d5bc..7a90b879f2 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, FALSE);
+	main_window = mail_capplet_shell_new(socket_id, FALSE, TRUE);
 	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 ae30f2f6d6..d1ccdf80ac 100644
--- a/capplet/mail-capplet-shell.c
+++ b/capplet/mail-capplet-shell.c
@@ -71,6 +71,8 @@ struct  _MailCappletShellPrivate {
 	GtkWidget *action_bar;
 	GtkWidget *quit;	
 	
+	gboolean main_loop;
+
 	MailViewChild *settings_view;
 };
 
@@ -196,8 +198,13 @@ ms_init_style (GtkStyle *style)
 static void
 mail_capplet_shell_quit (MailCappletShell *shell)
 {
-	gtk_main_quit();
-}
+	MailCappletShellPrivate *priv = shell->priv;
+
+	if (priv->main_loop)
+		gtk_main_quit();
+	else
+		gtk_widget_hide ((GtkWidget *)shell);
+}	
 
 static void
 mail_capplet_shell_quit_cb (GtkWidget *w G_GNUC_UNUSED,
@@ -261,7 +268,7 @@ handle_cmdline (MailView *mv, MailCappletShell *shell)
 #endif
 
 void
-mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean just_druid)
+mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean just_druid, gboolean main_loop)
 {
 	MailCappletShellPrivate *priv = shell->priv;
 	GtkWidget *tmp, *img, *box, *ar1, *ar2, *lbl;
@@ -284,7 +291,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, int socket_id, gboolean j
 		gtk_window_set_default_size ((GtkWindow *)shell, 1024, 500);
 	}
 
-
+	priv->main_loop = main_loop;
 	priv->box = (GtkWidget *) gtk_vbox_new (FALSE, 0);
 	gtk_widget_show ((GtkWidget *)priv->box);
 
@@ -375,10 +382,10 @@ mail_capplet_shell_toolbar_height (MailCappletShell *shell)
 }
 
 MailCappletShell *
-mail_capplet_shell_new (int socket_id, gboolean just_druid)
+mail_capplet_shell_new (int socket_id, gboolean just_druid, gboolean main_loop)
 {
 	MailCappletShell *shell = g_object_new (MAIL_CAPPLET_SHELL_TYPE, NULL);
-	mail_capplet_shell_construct (shell, socket_id, just_druid);
+	mail_capplet_shell_construct (shell, socket_id, just_druid, main_loop);
 
 	return shell;
 }
diff --git a/capplet/mail-capplet-shell.h b/capplet/mail-capplet-shell.h
index ab33850257..9cc4255760 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, gboolean just_druid);
+MailCappletShell * mail_capplet_shell_new (int socket_id, gboolean just_druid, gboolean main_loop);
 int mail_capplet_shell_toolbar_height (MailCappletShell *shell);
 
 #endif
-- 
cgit v1.2.3