Merge branch 'master' of git://git.netsurf-browser.org/netsurf

6 files changed, 396 insertions, 171 deletions

diff --git a/gtk/compat.h b/gtk/compat.h
index ff3222ca9..b8c91d914 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -56,6 +56,17 @@ typedef enum {
 #if !GTK_CHECK_VERSION(3,0,0)
 typedef GtkStateType GtkStateFlags;
 typedef GtkStyle GtkStyleContext;
+
+#if GTK_CHECK_VERSION(2,22,0)
+enum {
+	GTK_IN_DESTRUCTION = 1 << 0,
+};
+#define GTK_OBJECT_FLAGS(obj)		  (GTK_OBJECT (obj)->flags)
+#endif
+
+#define gtk_widget_in_destruction(widget) \
+	(GTK_OBJECT_FLAGS(GTK_OBJECT(widget)) & GTK_IN_DESTRUCTION)
+
 #endif
 
 GtkWidget *nsgtk_entry_new(void);
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 016e24fcd..b10fb69ae 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -139,7 +139,6 @@ struct gtk_scaffolding {
 
 	int				throb_frame;
 	struct gui_window		*top_level;
-	int				being_destroyed;
 
 	bool				fullscreen;
 
@@ -147,9 +146,6 @@ struct gtk_scaffolding {
 	struct gtk_scaffolding 		*next, *prev;
 };
 
-/** current number of open browser windows */
-static int open_windows = 0;
-
 /** current window for model dialogue use */
 static struct gtk_scaffolding *current_model;
 
@@ -251,60 +247,57 @@ static void popup_menu_show(struct nsgtk_popup_submenu *menu, bool submenu,
 /* event handlers and support functions for them */
 
 /**
- * resource cleanup function for window closure.
+ * resource cleanup function for window destruction.
  */
-static void nsgtk_window_close(struct gtk_scaffolding *g)
+static void scaffolding_window_destroy(GtkWidget *widget, gpointer data)
 {
-	/* close all tabs first */
-	gint numbertabs = gtk_notebook_get_n_pages(g->notebook);
-	while (numbertabs-- > 1) {
-		nsgtk_tab_close_current(g->notebook);
-	}
-	LOG(("Being Destroyed = %d", g->being_destroyed));
+	struct gtk_scaffolding *gs = data;
 
-	if ((g->history_window) && (g->history_window->window)) {
-		gtk_widget_destroy(GTK_WIDGET(g->history_window->window));
-	}
+	LOG(("scaffold:%p", gs));
 
-	if (--open_windows == 0)
-		netsurf_quit = true;
+	if ((gs->history_window) && (gs->history_window->window)) {
+		gtk_widget_destroy(GTK_WIDGET(gs->history_window->window));
+	}
 
-	if (!g->being_destroyed) {
-		g->being_destroyed = 1;
-		nsgtk_window_destroy_browser(g->top_level);
+	if (gs->prev != NULL) {
+		gs->prev->next = gs->next;
+	} else {
+		scaf_list = gs->next;
+	}
+	if (gs->next != NULL) {
+		gs->next->prev = gs->prev;
 	}
-	if (g->prev != NULL)
-		g->prev->next = g->next;
-	else
-		scaf_list = g->next;
 
-	if (g->next != NULL)
-		g->next->prev = g->prev;
+	LOG(("scaffold list head: %p", scaf_list));
 
+	if (scaf_list == NULL) {
+		/* no more open windows */
+		netsurf_quit = true;
+	}
 }
 
-static gboolean nsgtk_window_delete_event(GtkWidget *widget,
+/* signal delivered on window delete event, allowing to halt close if
+ * download is in progress
+ */
+static gboolean scaffolding_window_delete_event(GtkWidget *widget,
 		GdkEvent *event, gpointer data)
 {
-	struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
-	if ((open_windows != 1) ||
-	    nsgtk_check_for_downloads(GTK_WINDOW(widget)) == false) {
-		nsgtk_window_close(g);
+	struct gtk_scaffolding *g = data;
+
+	if (nsgtk_check_for_downloads(GTK_WINDOW(widget)) == false) {
 		gtk_widget_destroy(GTK_WIDGET(g->window));
 	}
 	return TRUE;
 }
 
 /* exported interface documented in gtk_scaffold.h */
-void nsgtk_scaffolding_destroy(nsgtk_scaffolding *g)
+void nsgtk_scaffolding_destroy(nsgtk_scaffolding *gs)
 {
-	/* Our top_level has asked us to die */
-	LOG(("Being Destroyed = %d", g->being_destroyed));
-	if (g->being_destroyed) return;
-	g->being_destroyed = 1;
-	nsgtk_window_close(g);
-	/* We're now unlinked, so let's finally destroy ourselves */
-	nsgtk_window_destroy_browser(g->top_level);
+	LOG(("scaffold: %p", gs));
+
+	if (gtk_widget_in_destruction(GTK_WIDGET(gs->window)) != TRUE) {
+		gtk_widget_destroy(GTK_WIDGET(gs->window));
+	}
 }
 
 /**
@@ -522,21 +515,32 @@ static void nsgtk_window_tabs_add(GtkNotebook *notebook,
 /**
  * Update the menus when the number of tabs changes.
  */
-static void nsgtk_window_tabs_remove(GtkNotebook *notebook,
-		GtkWidget *page, guint page_num, struct gtk_scaffolding *g)
-{
+static void
+nsgtk_window_tabs_remove(GtkNotebook *notebook,
+			 GtkWidget *page,
+			 guint page_num,
+			 struct gtk_scaffolding *gs)
+{
+	/* if the scaffold is being destroyed it is not useful to
+	 * update the state, futher many of the widgets may have
+	 * already been destroyed.
+	 */
+	if (gtk_widget_in_destruction(GTK_WIDGET(gs->window)) == TRUE) {
+		return;
+	}
 
-	if (gtk_notebook_get_n_pages(notebook) == 0) {
-		nsgtk_scaffolding_destroy(g);
-	} else {
-	gboolean visible = gtk_notebook_get_show_tabs(g->notebook);
-	g_object_set(g->menu_bar->view_submenu->tabs_menuitem, "visible", visible, NULL);
-	g_object_set(g->menu_popup->view_submenu->tabs_menuitem, "visible", visible, NULL);
-	g->buttons[NEXTTAB_BUTTON]->sensitivity = visible;
-	g->buttons[PREVTAB_BUTTON]->sensitivity = visible;
-	g->buttons[CLOSETAB_BUTTON]->sensitivity = visible;
-	nsgtk_scaffolding_set_sensitivity(g);
+	if (gtk_notebook_get_n_pages(notebook) == 1) {
+		nsgtk_scaffolding_destroy(gs);
+		return;
 	}
+
+	gboolean visible = gtk_notebook_get_show_tabs(gs->notebook);
+	g_object_set(gs->menu_bar->view_submenu->tabs_menuitem, "visible", visible, NULL);
+	g_object_set(gs->menu_popup->view_submenu->tabs_menuitem, "visible", visible, NULL);
+	gs->buttons[NEXTTAB_BUTTON]->sensitivity = visible;
+	gs->buttons[PREVTAB_BUTTON]->sensitivity = visible;
+	gs->buttons[CLOSETAB_BUTTON]->sensitivity = visible;
+	nsgtk_scaffolding_set_sensitivity(gs);
 }
 
 /**
@@ -605,9 +609,9 @@ MULTIHANDLER(newwindow)
 	return TRUE;
 }
 
-MULTIHANDLER(newtab)
+nserror nsgtk_scaffolding_new_tab(struct gui_window *gw)
 {
-	struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
+	struct browser_window *bw = nsgtk_get_browser_window(gw);
 	nsurl *url;
 	nserror error;
 
@@ -633,16 +637,17 @@ MULTIHANDLER(newtab)
 	if (url != NULL) {
 		nsurl_unref(url);
 	}
+	return error;
+}
+
+MULTIHANDLER(newtab)
+{
+	nserror error;
+
+	error = nsgtk_scaffolding_new_tab(g->top_level);
 	if (error != NSERROR_OK) {
 		warn_user(messages_get_errorcode(error), 0);
-	} else if (nsoption_bool(new_blank)) {
-		/** @todo what the heck is this for? */
-		GtkWidget *window = gtk_notebook_get_nth_page(g->notebook, -1);
-		nsgtk_widget_override_background_color(window,
-			GTK_STATE_NORMAL,
-			0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF);
 	}
-
 	return TRUE;
 }
 
@@ -947,12 +952,6 @@ MULTIHANDLER(print)
 
 MULTIHANDLER(closewindow)
 {
-	/* close all tabs first */
-	gint numbertabs = gtk_notebook_get_n_pages(g->notebook);
-	while (numbertabs-- > 1) {
-		nsgtk_tab_close_current(g->notebook);
-	}
-	nsgtk_window_close(g);
 	gtk_widget_destroy(GTK_WIDGET(g->window));
 	return TRUE;
 }
@@ -1570,14 +1569,15 @@ MULTIHANDLER(openlocation)
 
 MULTIHANDLER(nexttab)
 {
-	gtk_notebook_next_page(g->notebook);
+	nsgtk_tab_next(g->notebook);
 
 	return TRUE;
 }
 
 MULTIHANDLER(prevtab)
 {
-	gtk_notebook_prev_page(g->notebook);
+
+	nsgtk_tab_prev(g->notebook);
 
 	return TRUE;
 }
@@ -1846,12 +1846,13 @@ static bool nsgtk_new_scaffolding_popup(struct gtk_scaffolding *g, GtkAccelGroup
 
 nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 {
-	struct gtk_scaffolding *g = malloc(sizeof(*g));
+	struct gtk_scaffolding *g;
 	char *searchname;
 	int i;
 	GtkAccelGroup *group;
 	GError* error = NULL;
 
+	g = malloc(sizeof(*g));
 	if (g == NULL) {
 		warn_user("NoMemory", 0);
 		return NULL;
@@ -1861,8 +1862,6 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 
 	g->top_level = toplevel;
 
-	open_windows++;
-
 	/* load the window template from the glade xml file, and extract
 	 * widget references from it for later use.
 	 */
@@ -2015,7 +2014,7 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 
 	gtk_toolbar_set_show_arrow(g->tool_bar, TRUE);
 	gtk_widget_show_all(GTK_WIDGET(g->tool_bar));
-	nsgtk_tab_init(g->notebook);
+	nsgtk_tab_init(g);
 
 	gtk_widget_set_size_request(GTK_WIDGET(
 			g->buttons[HISTORY_BUTTON]->button), 20, -1);
@@ -2087,8 +2086,9 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 	g_signal_connect_after(g->notebook, "page-removed",
 			G_CALLBACK(nsgtk_window_tabs_remove), g);
 
-	/* connect signals to handlers. */
-	CONNECT(g->window, "delete-event", nsgtk_window_delete_event, g);
+	/* connect main window signals to their handlers. */
+	CONNECT(g->window, "delete-event", scaffolding_window_delete_event, g);
+	CONNECT(g->window, "destroy", scaffolding_window_destroy, g);
 
 	/* toolbar URL bar menu bar search bar signal handlers */
 	CONNECT(g->menu_bar->edit_submenu->edit, "show", nsgtk_window_edit_menu_clicked, g);
@@ -2136,8 +2136,6 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 
 	nsgtk_scaffolding_initial_sensitivity(g);
 
-	g->being_destroyed = 0;
-
 	g->fullscreen = false;
 
 
@@ -2164,21 +2162,21 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 	return g;
 }
 
-void gui_window_set_title(struct gui_window *_g, const char *title)
+void gui_window_set_title(struct gui_window *gw, const char *title)
 {
 	static char suffix[] = " - NetSurf";
   	char nt[strlen(title) + strlen(suffix) + 1];
-	struct gtk_scaffolding *g = nsgtk_get_scaffold(_g);
+	struct gtk_scaffolding *gs = nsgtk_get_scaffold(gw);
 
-	nsgtk_tab_set_title(_g, title);
+	nsgtk_tab_set_title(gw, title);
 
-	if (g->top_level == _g) {
+	if (gs->top_level == gw) {
 		if (title == NULL || title[0] == '\0') {
-			gtk_window_set_title(g->window, "NetSurf");
+			gtk_window_set_title(gs->window, "NetSurf");
 		} else {
 			strcpy(nt, title);
 			strcat(nt, suffix);
-			gtk_window_set_title(g->window, nt);
+			gtk_window_set_title(gs->window, nt);
 		}
 	}
 }
@@ -2473,8 +2471,10 @@ void nsgtk_scaffolding_set_top_level(struct gui_window *gw)
 	}
 }
 
+/* exported interface documented in scaffolding.h */
 void nsgtk_scaffolding_set_sensitivity(struct gtk_scaffolding *g)
 {
+	int i;
 #define SENSITIVITY(q)\
 		i = q##_BUTTON;\
 		if (g->buttons[i]->main != NULL)\
@@ -2495,7 +2495,6 @@ void nsgtk_scaffolding_set_sensitivity(struct gtk_scaffolding *g)
 					g->buttons[i]->popup),\
 					g->buttons[i]->sensitivity);
 
-	int i;
 	SENSITIVITY(STOP)
 	SENSITIVITY(RELOAD)
 	SENSITIVITY(CUT)
diff --git a/gtk/scaffolding.h b/gtk/scaffolding.h
index cf75f0af3..79e3fa0df 100644
--- a/gtk/scaffolding.h
+++ b/gtk/scaffolding.h
@@ -144,7 +144,27 @@ void nsgtk_scaffolding_set_top_level(struct gui_window *g);
 
 void nsgtk_scaffolding_destroy(nsgtk_scaffolding *g);
 
+/** update the sensitivity of context sensitive UI elements
+ *
+ * widgets altered in arrays:
+ *   main
+ *   right click menu
+ *   location
+ *   popup
+ * current arrays are:
+ *   stop
+ *   reload
+ *   cut
+ *   copy
+ *   paste
+ *   back
+ *   forward
+ *   nexttab
+ *   prevtab
+ *   closetab
+ */
 void nsgtk_scaffolding_set_sensitivity(struct gtk_scaffolding *g);
+
 void nsgtk_scaffolding_initial_sensitivity(struct gtk_scaffolding *g);
 void nsgtk_scaffolding_popup_menu(struct gtk_scaffolding *g, gdouble x,
     gdouble y);
@@ -155,4 +175,6 @@ void nsgtk_scaffolding_set_icon(struct gui_window *gw);
 gboolean nsgtk_window_url_activate_event(GtkWidget *, gpointer);
 gboolean nsgtk_window_url_changed(GtkWidget *, GdkEventKey *, gpointer);
 
+nserror nsgtk_scaffolding_new_tab(struct gui_window *gw);
+
 #endif /* NETSURF_GTK_SCAFFOLDING_H */
diff --git a/gtk/tabs.c b/gtk/tabs.c
index 462f6668e..c5ef6fe9c 100644
--- a/gtk/tabs.c
+++ b/gtk/tabs.c
@@ -46,7 +46,7 @@ static void nsgtk_tab_update_size(GtkWidget *hbox, GtkStyle *previous_style,
 	style = nsgtk_widget_get_style_context(hbox);
 
 	context = gtk_widget_get_pango_context(hbox);
-	metrics = pango_context_get_metrics(context, 
+	metrics = pango_context_get_metrics(context,
 				nsgtk_style_context_get_font(style, state),
 				pango_context_get_language(context));
 
@@ -107,21 +107,80 @@ static GtkWidget *nsgtk_tab_label_setup(struct gui_window *window)
 	g_object_set_data(G_OBJECT(hbox), "label", label);
 	g_object_set_data(G_OBJECT(hbox), "close-button", button);
 
-	nsgtk_window_set_tab(window, hbox);
 
 	gtk_widget_show_all(hbox);
 	return hbox;
 }
+#include "utils/log.h"
 
 /** callback when page is switched */
-static void nsgtk_tab_page_changed(GtkNotebook *notebook, gpointer *page,
-		gint page_num)
+
+static gint srcpagenum;
+
+/** The switch-page signal handler
+ *
+ * This signal is handled both before and after delivery to work round
+ * issue that setting the selected tab during the switch-page signal
+ * fails
+ */
+static void
+nsgtk_tab_switch_page(GtkNotebook *notebook,
+		      GtkWidget *page,
+		      guint selpagenum,
+		      gpointer user_data)
+{
+	srcpagenum = gtk_notebook_get_current_page(notebook);
+}
+
+static void
+nsgtk_tab_switch_page_after(GtkNotebook *notebook,
+			    GtkWidget *selpage,
+			    guint selpagenum,
+			    gpointer user_data)
 {
-	GtkWidget *window = gtk_notebook_get_nth_page(notebook, page_num);
-	struct gui_window *gw = g_object_get_data(G_OBJECT(window),
-			"gui_window");
-	if (gw != NULL) {
-		nsgtk_scaffolding_set_top_level(gw);
+	GtkWidget *srcpage;
+	GtkWidget *addpage;
+	struct gui_window *gw;
+	nserror error;
+
+	addpage = g_object_get_data(G_OBJECT(notebook), "addtab");
+
+	if (selpage == addpage) {
+		if ((srcpagenum != -1) &&
+		    (srcpagenum != (gint)selpagenum)) {
+			/* ensure the add tab is not actually selected */
+			LOG(("src %d sel %d",srcpagenum,selpagenum ));
+			srcpage = gtk_notebook_get_nth_page(notebook, srcpagenum);
+			gw = g_object_get_data(G_OBJECT(srcpage), "gui_window");
+			if ((gw != NULL) && (nsgtk_get_scaffold(gw) != NULL)) {
+				error = nsgtk_scaffolding_new_tab(gw);
+			}
+		}
+	} else {
+		LOG(("sel %d", selpagenum ));
+		/* tab with page in it */
+		gw = g_object_get_data(G_OBJECT(selpage), "gui_window");
+		if (gw != NULL) {
+			nsgtk_scaffolding_set_top_level(gw);
+		}
+	}
+}
+
+static void nsgtk_tab_page_reordered(GtkNotebook *notebook,
+				     GtkWidget *child,
+				     guint page_num,
+				     gpointer user_data)
+{
+	gint pages;
+	GtkWidget *addpage;
+
+	pages = gtk_notebook_get_n_pages(notebook);
+	addpage = g_object_get_data(G_OBJECT(notebook), "addtab");
+
+	if (((gint)page_num == (pages - 1)) &&
+	    (child != addpage)) {
+		/* moved tab to end */
+		gtk_notebook_reorder_child(notebook, addpage, -1);
 	}
 }
 
@@ -148,16 +207,53 @@ nsgtk_tab_orientation(GtkNotebook *notebook)
 	}
 }
 
+/** adds a "new tab" tab */
+static GtkWidget *
+nsgtk_tab_add_newtab(GtkNotebook *notebook)
+{
+	GtkWidget *tablabel;
+	GtkWidget *tabcontents;
+	GtkWidget *add;
+
+	tablabel = nsgtk_hbox_new(FALSE, 1);
+	tabcontents = nsgtk_hbox_new(FALSE, 1);
+
+	add = gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_MENU);
+
+	gtk_box_pack_start(GTK_BOX(tablabel), add, FALSE, FALSE, 0);
+
+	gtk_widget_show_all(tablabel);
+
+	gtk_notebook_append_page(notebook, tabcontents, tablabel);
+
+	gtk_notebook_set_tab_reorderable(notebook, tabcontents, false);
+
+	gtk_widget_show_all(tabcontents);
+
+	g_object_set_data(G_OBJECT(notebook), "addtab", tabcontents);
+
+	return tablabel;
+}
+
 /** callback to alter tab visibility when pages are added or removed */
-static void 
+static void
 nsgtk_tab_visibility_update(GtkNotebook *notebook, GtkWidget *child, guint page)
 {
-	gint num_pages = gtk_notebook_get_n_pages(notebook);
+	gint pagec = gtk_notebook_get_n_pages(notebook);
+	GtkWidget *addpage = g_object_get_data(G_OBJECT(notebook), "addtab");
+
+	if (addpage != NULL) {
+		pagec--; /* skip the add tab */
+		if ((gint)page == pagec) {
+			/* ensure the add new tab cannot be current */
+			gtk_notebook_set_current_page(notebook, page - 1);
+		}
+	}
 
-        if ((nsoption_bool(show_single_tab) == true) || (num_pages > 1)) {
-                gtk_notebook_set_show_tabs(notebook, TRUE);
+	if ((nsoption_bool(show_single_tab) == true) || (pagec > 1)) {
+		gtk_notebook_set_show_tabs(notebook, TRUE);
 	} else {
-                gtk_notebook_set_show_tabs(notebook, FALSE);
+		gtk_notebook_set_show_tabs(notebook, FALSE);
 	}
 }
 
@@ -165,47 +261,72 @@ nsgtk_tab_visibility_update(GtkNotebook *notebook, GtkWidget *child, guint page)
 void nsgtk_tab_options_changed(GtkNotebook *notebook)
 {
 	nsgtk_tab_orientation(notebook);
-        nsgtk_tab_visibility_update(notebook, NULL, 0);
+	nsgtk_tab_visibility_update(notebook, NULL, 0);
 }
 
+
 /* exported interface documented in gtk/tabs.h */
-void nsgtk_tab_init(GtkNotebook *notebook)
+void nsgtk_tab_init(struct gtk_scaffolding *gs)
 {
+	GtkNotebook *notebook;
+
+	notebook = nsgtk_scaffolding_notebook(gs);
+
+	nsgtk_tab_add_newtab(notebook);
+
 	g_signal_connect(notebook, "switch-page",
-                         G_CALLBACK(nsgtk_tab_page_changed), NULL);
+			 G_CALLBACK(nsgtk_tab_switch_page), NULL);
+	g_signal_connect_after(notebook, "switch-page",
+			 G_CALLBACK(nsgtk_tab_switch_page_after), NULL);
 
 	g_signal_connect(notebook, "page-removed",
-                         G_CALLBACK(nsgtk_tab_visibility_update), NULL);
+			 G_CALLBACK(nsgtk_tab_visibility_update), NULL);
 	g_signal_connect(notebook, "page-added",
-                         G_CALLBACK(nsgtk_tab_visibility_update), NULL);
+			 G_CALLBACK(nsgtk_tab_visibility_update), NULL);
+	g_signal_connect(notebook, "page-reordered",
+			 G_CALLBACK(nsgtk_tab_page_reordered), NULL);
+
 
-        nsgtk_tab_options_changed(notebook);
+	nsgtk_tab_options_changed(notebook);
 }
 
 /* exported interface documented in gtk/tabs.h */
-void nsgtk_tab_add(struct gui_window *window, 
-		GtkWidget *tab_contents, bool background)
+void nsgtk_tab_add(struct gui_window *gw,
+		   GtkWidget *tab_contents,
+		   bool background)
 {
-	GtkWidget *tabs = GTK_WIDGET(nsgtk_scaffolding_notebook(
-			nsgtk_get_scaffold(window)));
-	GtkWidget *tabBox = nsgtk_tab_label_setup(window);
-	gint remember = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-
-	gtk_notebook_append_page(GTK_NOTEBOOK(tabs), tab_contents, tabBox);
-	/*causes gtk errors can't set a parent */
-	gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(tabs), 
-			tab_contents,
-			true);
+	GtkNotebook *notebook;
+	GtkWidget *tabBox;
+	gint remember;
+	gint pages;
+	gint newpage;
+
+	g_object_set_data(G_OBJECT(tab_contents), "gui_window", gw);
+
+	notebook = nsgtk_scaffolding_notebook(nsgtk_get_scaffold(gw));
+
+	tabBox = nsgtk_tab_label_setup(gw);
+
+	nsgtk_window_set_tab(gw, tabBox);
+
+	remember = gtk_notebook_get_current_page(notebook);
+
+	pages = gtk_notebook_get_n_pages(notebook);
+
+	newpage = gtk_notebook_insert_page(notebook, tab_contents, tabBox, pages - 1);
+
+	gtk_notebook_set_tab_reorderable(notebook, tab_contents, true);
+
 	gtk_widget_show_all(tab_contents);
-	gtk_notebook_set_current_page(GTK_NOTEBOOK(tabs), 
-			gtk_notebook_get_n_pages(GTK_NOTEBOOK(tabs)) - 1);
 
 	if (background) {
-		gtk_notebook_set_current_page(GTK_NOTEBOOK(tabs), remember);
+		gtk_notebook_set_current_page(notebook, remember);
+	} else {
+		gtk_notebook_set_current_page(notebook, newpage);
 	}
 
 	gtk_widget_grab_focus(GTK_WIDGET(nsgtk_scaffolding_urlbar(
-			nsgtk_get_scaffold(window))));
+			nsgtk_get_scaffold(gw))));
 }
 
 /* exported interface documented in gtk/tabs.h */
@@ -222,21 +343,74 @@ void nsgtk_tab_set_title(struct gui_window *g, const char *title)
 	label = g_object_get_data(G_OBJECT(tab), "label");
 	gtk_label_set_text(GTK_LABEL(label), title);
 	gtk_widget_set_tooltip_text(tab, title);
-	
+
 }
 
 /* exported interface documented in gtk/tabs.h */
-void nsgtk_tab_close_current(GtkNotebook *notebook)
+nserror nsgtk_tab_close_current(GtkNotebook *notebook)
 {
-	gint curr_page = gtk_notebook_get_current_page(notebook);
-	GtkWidget *window = gtk_notebook_get_nth_page(notebook, curr_page);
-	struct gui_window *gw = g_object_get_data(G_OBJECT(window),
-			"gui_window");
+	gint pagen;
+	GtkWidget *page;
+	struct gui_window *gw;
+	GtkWidget *addpage;
+
+	pagen = gtk_notebook_get_current_page(notebook);
+	if (pagen == -1) {
+		return NSERROR_OK;
+	}
+
+	page = gtk_notebook_get_nth_page(notebook, pagen);
+	if (page == NULL) {
+		return NSERROR_OK;
+	}
+
+	addpage = g_object_get_data(G_OBJECT(notebook), "addtab");
+	if (page == addpage) {
+		/* the add new tab page is current, cannot close that */
+		return NSERROR_OK;
+	}
 
-	if (gtk_notebook_get_n_pages(notebook) < 2)
-		return;	/* wicked things happen if we close the last tab */
+	gw = g_object_get_data(G_OBJECT(page), "gui_window");
+	if (gw == NULL) {
+		return NSERROR_OK;
+	}
 
 	nsgtk_window_destroy_browser(gw);
-	/* deletes 2 notebook tabs at a time!
-	gtk_notebook_remove_page(notebook, curr_page); */
+
+	return NSERROR_OK;
+}
+
+nserror nsgtk_tab_prev(GtkNotebook *notebook)
+{
+	gtk_notebook_prev_page(notebook);
+
+	return NSERROR_OK;
+
+}
+
+nserror nsgtk_tab_next(GtkNotebook *notebook)
+{
+	gint pagen;
+	GtkWidget *page;
+	GtkWidget *addpage;
+
+	pagen = gtk_notebook_get_current_page(notebook);
+	if (pagen == -1) {
+		return NSERROR_OK;
+	}
+
+	page = gtk_notebook_get_nth_page(notebook, pagen + 1);
+	if (page == NULL) {
+		return NSERROR_OK;
+	}
+
+	addpage = g_object_get_data(G_OBJECT(notebook), "addtab");
+	if (page == addpage) {
+		/* cannot make add new tab page current */
+		return NSERROR_OK;
+	}
+
+	gtk_notebook_set_current_page(notebook, pagen + 1);
+
+	return NSERROR_OK;
 }
diff --git a/gtk/tabs.h b/gtk/tabs.h
index 862e2d9ca..959799edd 100644
--- a/gtk/tabs.h
+++ b/gtk/tabs.h
@@ -21,10 +21,12 @@
 
 struct gui_window;
 
-void nsgtk_tab_init(GtkNotebook *notebook);
+void nsgtk_tab_init(struct gtk_scaffolding *gs);
 void nsgtk_tab_add(struct gui_window *window, GtkWidget *tab_contents, bool background);
 void nsgtk_tab_set_title(struct gui_window *g, const char *title);
 void nsgtk_tab_options_changed(GtkNotebook *notebook);
-void nsgtk_tab_close_current(GtkNotebook *notebook);
+nserror nsgtk_tab_close_current(GtkNotebook *notebook);
+nserror nsgtk_tab_prev(GtkNotebook *notebook);
+nserror nsgtk_tab_next(GtkNotebook *notebook);
 
 #endif
diff --git a/gtk/window.c b/gtk/window.c
index 6a5cce160..34d7a4c6f 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -78,6 +78,9 @@ struct gui_window {
 	/** previous event location */
 	int last_x, last_y;
 
+	/** The top level container (tabContents) */
+	GtkWidget *container;
+
 	/** display widget for this page or frame */
 	GtkLayout *layout;
 
@@ -644,6 +647,14 @@ static gboolean nsgtk_paned_size_allocate_event(GtkWidget *widget,
 	return TRUE;
 }
 
+/* destroy the browsing context as there is nothing to display it now */
+static void window_destroy(GtkWidget *widget, gpointer data)
+{
+	struct gui_window *gw = data;
+
+	browser_window_destroy(gw->bw);
+}
+
 /* Core interface docuemnted in desktop/gui.h to create a gui_window */
 struct gui_window *gui_create_browser_window(struct browser_window *bw,
 					     struct browser_window *clone,
@@ -651,6 +662,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 {
 	struct gui_window *g; /**< what we're creating to return */
 	GError* error = NULL;
+	bool tempback;
 
 	g = calloc(1, sizeof(*g));
 	if (!g) {
@@ -685,7 +697,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 
 	/* Construct our primary elements */
 
-	/* top-level document (not a frame) => create a new tab */
+	/* top-level document create a new tab */
 	GtkBuilder* xml = gtk_builder_new();
 	if (!gtk_builder_add_from_file(xml,
 				       glade_file_location->tabcontents,
@@ -695,33 +707,16 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 		return 0;
 	}
 
+	g->container = GTK_WIDGET(gtk_builder_get_object(xml, "tabContents"));
 	g->layout = GTK_LAYOUT(gtk_builder_get_object(xml, "layout"));
 	g->status_bar = GTK_LABEL(gtk_builder_get_object(xml, "status_bar"));
 	g->paned = GTK_PANED(gtk_builder_get_object(xml, "hpaned1"));
 
-	/* add the tab to the scaffold */
-	bool tempback = true;
-	switch (temp_open_background) {
-	case -1:
-		tempback = !(nsoption_bool(focus_new));
-		break;
-	case 0:
-		tempback = false;
-		break;
-	case 1:
-		tempback = true;
-		break;
-	}
-
-	GtkWidget *tab_contents = GTK_WIDGET(gtk_builder_get_object(xml, "tabContents"));
-	g_object_set_data(G_OBJECT(tab_contents), "gui_window", g);
-	nsgtk_tab_add(g, tab_contents, tempback);
-
-	g_object_unref(xml);
 
-	/* Attach ourselves to the list (push_top) */
-	if (window_list)
+	/* add new gui window to global list (push_top) */
+	if (window_list) {
 		window_list->prev = g;
+	}
 	g->next = window_list;
 	g->prev = NULL;
 	window_list = g;
@@ -743,8 +738,8 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 
 	/* set the default background colour of the drawing area to white. */
 	nsgtk_widget_override_background_color(GTK_WIDGET(g->layout),
-					       GTK_STATE_NORMAL, 0, 0xffff, 0xffff, 0xffff);
-
+					       GTK_STATE_NORMAL,
+					       0, 0xffff, 0xffff, 0xffff);
 
 	nsgtk_connect_draw_event(GTK_WIDGET(g->layout),
 				 G_CALLBACK(nsgtk_window_draw_event), g);
@@ -771,6 +766,29 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 	CONNECT(g->paned, "notify::position",
 		nsgtk_paned_notify__position, g);
 
+	/* gtk container destructor */
+	CONNECT(g->container, "destroy",
+		window_destroy, g);
+
+	/* add the tab container to the scaffold notebook */
+	switch (temp_open_background) {
+	case -1:
+		tempback = !(nsoption_bool(focus_new));
+		break;
+	case 0:
+		tempback = false;
+		break;
+	default:
+		tempback = true;
+		break;
+	}
+	nsgtk_tab_add(g, g->container, tempback);
+
+	/* safe to drop the reference to the xml as the container is
+	 * referenced by the notebook now.
+	 */
+	g_object_unref(xml);
+
 	return g;
 }
 
@@ -811,31 +829,30 @@ void nsgtk_window_process_reformats(void)
 	}
 }
 
-
-void nsgtk_window_destroy_browser(struct gui_window *g)
+void nsgtk_window_destroy_browser(struct gui_window *gw)
 {
-	browser_window_destroy(g->bw);
+	/* remove tab */
+	gtk_widget_destroy(gw->container);
 }
 
 void gui_window_destroy(struct gui_window *g)
 {
-	if (g->prev)
+	LOG(("gui_window: %p", g));
+	assert(g != NULL);
+	assert(g->bw != NULL);
+	LOG(("scaffolding: %p", g->scaffold));
+
+	if (g->prev) {
 		g->prev->next = g->next;
-	else
+	} else {
 		window_list = g->next;
+	}
 
-	if (g->next)
+	if (g->next) {
 		g->next->prev = g->prev;
+	}
 
-
-	LOG(("Destroying gui_window %p", g));
-	assert(g != NULL);
-	assert(g->bw != NULL);
-	LOG(("	   Scaffolding: %p", g->scaffold));
-	LOG(("	   Window name: %s", g->bw->name));
-
-	/* tab => remove tab */
-	gtk_widget_destroy(gtk_widget_get_parent(GTK_WIDGET(g->layout)));
+	LOG(("window list head: %p", window_list));
 }
 
 /**