X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=25f744e4b187fb9786c9911b104ebf4ee848f1a8;hb=4337f9b90f61b92a61f0ff2751ff44bc58d23d13;hp=7edf963e28cf9f58010971abf5ee8f3458740cae;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae;p=modest

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 7edf963..25f744e 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1114,7 +1114,8 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
 	ShowHelper *helper = (ShowHelper *) user_data;
 	GtkWidget *folder_win = helper->folder_win;
 	ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-	
+	ModestAccountMgr *mgr;
+
 	priv->folder_view = MODEST_FOLDER_VIEW (modest_platform_create_folder_view (NULL));
 	wrap_in_scrolled_window (folder_win, GTK_WIDGET(priv->folder_view));
 
@@ -1136,18 +1137,10 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
 	restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
 	priv->wait_for_settings = FALSE;
 
-	/* Check if accounts exist and show the account wizard if not */
-	gboolean accounts_exist = 
-		modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
-
-	if (!accounts_exist) {
-		/* This is necessary to have the main window shown behind the dialog 
-		It's an ugly hack... jschmid */
-		gtk_widget_show_all(GTK_WIDGET(self));
-		modest_ui_actions_on_accounts (NULL, MODEST_WINDOW(self));
-	} else {
+	/* Update the menus if there are accounts */
+	mgr = modest_runtime_get_account_mgr();
+	if (modest_account_mgr_has_accounts(mgr, TRUE))
 		update_menus (MODEST_MAIN_WINDOW (self));
-	}
 
 	/* Never call this function again (NOTE that it could happen
 	   as we hide the main window instead of closing it while
@@ -1721,7 +1714,7 @@ on_inner_widgets_key_pressed (GtkWidget *widget,
 		return FALSE;
 
 	if (MODEST_IS_HEADER_VIEW (widget)) {
-		if (event->keyval == GDK_Left)
+		if (event->keyval == GDK_Left || event->keyval == GDK_KP_Left)
 			gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view));
 		else if ((event->keyval == GDK_Return)||(event->keyval == GDK_KP_Enter)) {
 			guint selected_headers = modest_header_view_count_selected_headers (MODEST_HEADER_VIEW (widget));
@@ -1744,7 +1737,8 @@ on_inner_widgets_key_pressed (GtkWidget *widget,
 				}
 			}
 		}
-	} else if (MODEST_IS_FOLDER_VIEW (widget) && (event->keyval == GDK_Right || event->keyval == GDK_Left)) {
+	} else if (MODEST_IS_FOLDER_VIEW (widget) && 
+		   (event->keyval == GDK_Right || event->keyval == GDK_KP_Right || event->keyval == GDK_Left || event->keyval == GDK_KP_Left)) {
 #if GTK_CHECK_VERSION(2, 8, 0) /* TODO: gtk_tree_view_get_visible_range() is only available in GTK+ 2.8 */
 		GtkTreePath *selected_path = NULL;
 		GtkTreePath *start_path = NULL;
@@ -2244,6 +2238,10 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
 
 	/* Show */
 	gtk_widget_show_all (priv->contents_widget);
+
+	/* Recompute dimming rules */
+        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+	modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
 }
 
 ModestMainWindowContentsStyle
@@ -2767,7 +2765,8 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 {
 	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (window), FALSE);
 
-	hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+	hildon_banner_show_information (NULL, NULL, 
+					_CS("ckct_ib_cannot_zoom_here"));
 	return FALSE;
 
 }
@@ -3056,10 +3055,9 @@ on_window_destroy (GtkObject *widget,
 	remove_banners (MODEST_MAIN_WINDOW (widget));
 }
 
-<<<<<<< .working
 static void
 opening_banner_destroyed (gpointer data,
-			  GObject *where_the_object_was)
+			   GObject *where_the_object_was)
 {
 	ModestMainWindowPrivate *priv = NULL;
 
@@ -3068,19 +3066,6 @@ opening_banner_destroyed (gpointer data,
 	priv->opening_banner = NULL;
 }
 
-=======
-static void
-retrieving_banner_destroyed (gpointer data,
-			     GObject *where_the_object_was)
-{
-	ModestMainWindowPrivate *priv = NULL;
-
-	priv = MODEST_MAIN_WINDOW_GET_PRIVATE (data);
-
-	priv->retrieving_banner = NULL;
-}
-
->>>>>>> .merge-right.r5668
 static gboolean
 show_opening_banner (gpointer user_data)
 {
@@ -3106,8 +3091,8 @@ show_opening_banner (gpointer user_data)
 		/* We need this because banners in Maemo could be
 		   destroyed by dialogs so we need to properly update
 		   our reference to it */
-		g_object_weak_ref (G_OBJECT (priv->retrieving_banner),
-				   retrieving_banner_destroyed,
+		g_object_weak_ref (G_OBJECT (priv->updating_banner),
+				   updating_banner_destroyed,
 				   user_data);
 		gdk_threads_leave ();
 	}