Apply contributions from Mark Benjamin and Chris Tarnowski, with some reworking from me. Beware; glade nastyness ahead.

svn path=/trunk/netsurf/; revision=7136

1 files changed, 22 insertions, 19 deletions

diff --git a/gtk/gtk_window.h b/gtk/gtk_window.h
index 0f99549a7..71c86bca5 100644
--- a/gtk/gtk_window.h
+++ b/gtk/gtk_window.h
@@ -24,33 +24,33 @@
 #include "gtk/gtk_scaffolding.h"
 
 struct gui_window {
-        /* All gui_window objects have an ultimate scaffold */
-        nsgtk_scaffolding	*scaffold;
-        /* A gui_window is the rendering of a browser_window */
-        struct browser_window	*bw;
-        struct browser_mouse 	*mouse;
+	/* All gui_window objects have an ultimate scaffold */
+	nsgtk_scaffolding	*scaffold;
+	/* A gui_window is the rendering of a browser_window */
+	struct browser_window	*bw;
+	struct browser_mouse 	*mouse;
 
-        /* These are the storage for the rendering */
+	/* These are the storage for the rendering */
 	int			caretx, carety, careth;
 	gui_pointer_shape	current_pointer;
 	int			last_x, last_y;
 
-        /* Within GTK, a gui_window is a scrolled window
-         * with a viewport inside
-         * with a gtkfixed in that
-         * with a drawing area in that
-         * The scrolled window is optional and only chosen
-         * for frames which need it. Otherwise we just use
-         * a viewport.
-         */
-        GtkWidget		*tab;
-        GtkScrolledWindow	*scrolledwindow;
+	/* Within GTK, a gui_window is a scrolled window
+	 * with a viewport inside
+	 * with a gtkfixed in that
+	 * with a drawing area in that
+	 * The scrolled window is optional and only chosen
+	 * for frames which need it. Otherwise we just use
+	 * a viewport.
+	 */
+	GtkWidget		*tab;
+	GtkScrolledWindow	*scrolledwindow;
 	GtkViewport		*viewport;
-        GtkFixed                *fixed;
+	GtkFixed		*fixed;
 	GtkDrawingArea		*drawing_area;
 
-        /* Keep gui_windows in a list for cleanup later */
-        struct gui_window	*next, *prev;
+	/* Keep gui_windows in a list for cleanup later */
+	struct gui_window	*next, *prev;
 };
 
 struct browser_mouse {
@@ -63,6 +63,9 @@ struct browser_mouse {
 	browser_mouse_state state;
 };
 
+extern struct gui_window * window_list;
+extern int temp_open_background;
+
 void nsgtk_reflow_all_windows(void);
 void nsgtk_window_process_reformats(void);