Title of folder window should be the mailbox if set

pmo-trunk-r7757

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 8ee75b3..0219368 100644 (file)
--- 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);

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index aa64f3a..78be16d 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -3899,4 +3899,20 @@ modest_folder_view_set_mailbox (ModestFolderView *self, const gchar *mailbox)
                g_free (priv->mailbox);
 
        priv->mailbox = g_strdup (mailbox);
+
+       /* Notify observers */
+       g_signal_emit (G_OBJECT(self),
+                      signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0,
+                      priv->visible_account_id);
+}
+
+const gchar *
+modest_folder_view_get_mailbox (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), NULL);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       return (const gchar *) priv->mailbox;
 }

diff --git a/src/widgets/modest-folder-view.h b/src/widgets/modest-folder-view.h
index 3424d4c..7366313 100644 (file)
--- a/src/widgets/modest-folder-view.h
+++ b/src/widgets/modest-folder-view.h
@@ -195,6 +195,16 @@ void         modest_folder_view_set_mailbox (ModestFolderView *self,
                                             const gchar *mailbox);
 
 /**
+ * modest_folder_view_get_mailbox:
+ * @self: a #ModestFolderView
+ *
+ * Return the current mailbox set for filtering in folder view
+ *
+ * Returns: a string, or %NULL
+ */
+const gchar *modest_folder_view_get_mailbox (ModestFolderView *self);
+
+/**
  * modest_folder_view_get_account_id_of_visible_server_account:
  * @self: a #ModestFolderView
  *