X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-folder-window.c;h=04aaf87eb555ba8deb700d7ffec7a7217f2d2e84;hb=8387f4db6a1b87ebc6edc3d1365f0e1e38a02b48;hp=a171a991b5ec907deab11915dac9552020299d07;hpb=94ffd80f2782671cdcc38fd59458f0bae4474d7b;p=modest

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index a171a99..04aaf87 100644
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -217,11 +217,20 @@ on_visible_account_changed (ModestFolderView *folder_view,
 								     account_id);
 		if (acc) {
 			const gchar *name;
+			const gchar *mailbox;
 			gchar *title = NULL;
+			ModestFolderWindowPrivate *priv;
 
-			name = modest_tny_account_get_parent_modest_account_name_for_server_account (acc);
-			title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(),
-								     name);
+			priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data);
+
+			mailbox = modest_folder_view_get_mailbox (MODEST_FOLDER_VIEW (priv->folder_view));
+			if (mailbox) {
+				title = g_strdup (mailbox);
+			} else {
+				name = modest_tny_account_get_parent_modest_account_name_for_server_account (acc);
+				title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(),
+									     name);
+			}
 			if (title) {
 				gtk_window_set_title (GTK_WINDOW (user_data), title);
 				g_free (title);
@@ -278,6 +287,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 	guint accel_key;
 	GdkModifierType accel_mods;
 	GtkAccelGroup *accel_group;
+	GtkWidget *top_alignment;
 	
 	self  = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
 	priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
@@ -311,14 +321,20 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 						  TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
 
 	priv->top_vbox = gtk_vbox_new (0, FALSE);
+	top_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (top_alignment),
+				   0, 0,
+				   HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
 
 	gtk_container_add (GTK_CONTAINER (pannable), priv->folder_view);
-	gtk_box_pack_end (GTK_BOX (priv->top_vbox), pannable, TRUE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (top_alignment), pannable);
+	gtk_box_pack_end (GTK_BOX (priv->top_vbox), top_alignment, TRUE, TRUE, 0);
 	gtk_container_add (GTK_CONTAINER (self), priv->top_vbox);
 
 	gtk_widget_show (priv->folder_view);
 	gtk_widget_show (pannable);
 	gtk_widget_show (priv->top_vbox);
+	gtk_widget_show (top_alignment);
 
 	connect_signals (MODEST_FOLDER_WINDOW (self));
 
@@ -437,6 +453,19 @@ free_refs:
 
 }
 
+void
+modest_folder_window_set_mailbox (ModestFolderWindow *self,
+				  const gchar *mailbox)
+{
+	ModestFolderWindowPrivate *priv = NULL;
+
+	g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
+	priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+	modest_folder_view_set_mailbox (MODEST_FOLDER_VIEW (priv->folder_view), mailbox);
+
+}
+
 static void
 setup_menu (ModestFolderWindow *self)
 {