[anjal] Fix for moblin bug: 3746 - Show folder list, post account creation.



commit 588ea41bfab15e42a8629c2b9bb1790a4fbccfd2
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Tue Jun 23 15:26:01 2009 +0530

    Fix for moblin bug: 3746 - Show folder list, post account creation.

 src/mail-settings-view.c |    4 +++-
 src/mail-settings-view.h |    2 +-
 src/mail-shell.c         |    2 +-
 src/mail-view.c          |    6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/mail-settings-view.c b/src/mail-settings-view.c
index ad218ca..89cc013 100644
--- a/src/mail-settings-view.c
+++ b/src/mail-settings-view.c
@@ -197,10 +197,12 @@ mail_settings_view_get_tab_widget(MailSettingsView *mcv)
 }
 
 void
-mail_settings_view_activate (MailSettingsView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, gboolean act)
+mail_settings_view_activate (MailSettingsView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, GtkWidget *slider, gboolean act)
 {
 	 if (!folder_tree || !check_mail || !sort_by)
 		  return;
+	 if (!GTK_WIDGET_VISIBLE(folder_tree))
+		 gtk_widget_show (slider);
 	 gtk_widget_set_sensitive (check_mail, act);
 	 gtk_widget_set_sensitive (sort_by, act);
 }
diff --git a/src/mail-settings-view.h b/src/mail-settings-view.h
index 558be09..bf0407a 100644
--- a/src/mail-settings-view.h
+++ b/src/mail-settings-view.h
@@ -56,5 +56,5 @@ typedef struct _MailSettingsViewClass {
 
 MailSettingsView *mail_settings_view_new (void);
 GtkWidget * mail_settings_view_get_tab_widget(MailSettingsView *mcv);
-void mail_settings_view_activate (MailSettingsView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, gboolean act);
+void mail_settings_view_activate (MailSettingsView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, GtkWidget *slider, gboolean act);
 #endif
diff --git a/src/mail-shell.c b/src/mail-shell.c
index cb162ef..e25d543 100644
--- a/src/mail-shell.c
+++ b/src/mail-shell.c
@@ -453,7 +453,7 @@ mail_shell_construct (MailShell *shell)
 	gtk_widget_show (box);
 	gtk_widget_hide (tmp);
 	gtk_widget_hide (ar1);
-	gtk_widget_hide (ar2);
+	gtk_widget_show (ar2);
 	box = gtk_hbox_new (FALSE, 0);
 	gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 0);
 	priv->slider = tmp;
diff --git a/src/mail-view.c b/src/mail-view.c
index 3e95a5c..0384201 100644
--- a/src/mail-view.c
+++ b/src/mail-view.c
@@ -127,7 +127,7 @@ mv_switch (GtkNotebook     *notebook,GtkNotebookPage *page, guint page_num, gpoi
 		} else if (child->type == MAIL_VIEW_ACCOUNT)
 			mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
 		else if (child->type == MAIL_VIEW_SETTINGS)
-			mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+			mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
 
 		
 		
@@ -273,7 +273,7 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 	} else if (child->type == MAIL_VIEW_ACCOUNT)
 		mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_SETTINGS)
-		mail_settings_view_activate ((MailSettingsView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+		mail_settings_view_activate ((MailSettingsView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
 	
 }
 
@@ -401,7 +401,7 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block)
 		gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
 	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0);
 	if(!block)
-		 mail_settings_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+		 mail_settings_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
 
 	return (MailViewChild *)msv;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]