Append new tab on the window with most tabs in the current workspace

This change uses a different heuristic to decide on what the best window to add
a new tab is from the last window which has been interacted with, which might
even be in a different workspace, to the window with the most tabs in the
current workspace. If no window exists on the current workspace one will be
created.

Partial fix for https://bugzilla.gnome.org/show_bug.cgi?id=685976

1 files changed, 38 insertions, 0 deletions

diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index eb9789166..9800038cb 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -1061,6 +1061,44 @@ ephy_shell_get_n_windows (EphyShell *shell)
   return g_list_length (shell->priv->windows);
 }
 
+EphyWindow*
+ephy_shell_get_main_window (EphyShell *shell)
+{
+  EphyWindow *window = NULL;
+  GList *windows;
+  GList *iter;
+
+  g_return_val_if_fail (EPHY_IS_SHELL (shell), NULL);
+
+  /* Select the window with most tabs in the current workspace as the window to
+   * use for opening a new tab on, if that turns out to be the case.
+   */
+  windows = ephy_shell_get_windows (shell);
+
+  for (iter = windows; iter != NULL; iter = iter->next) {
+    EphyWindow *candidate = EPHY_WINDOW (iter->data);
+    GtkWidget *cur_notebook;
+    GtkWidget *cand_notebook;
+
+    if (!ephy_window_is_on_current_workspace (candidate))
+      continue;
+
+    if (!window) {
+      window = candidate;
+      continue;
+    }
+
+    cur_notebook = ephy_window_get_notebook (window);
+    cand_notebook =  ephy_window_get_notebook (candidate);
+    if (gtk_notebook_get_n_pages (cand_notebook) > gtk_notebook_get_n_pages (cur_notebook))
+      window = candidate;
+  }
+
+  g_list_free (windows);
+
+  return window;
+}
+
 gboolean
 ephy_shell_close_all_windows (EphyShell *shell)
 {