summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-02-09 13:07:39 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2014-02-09 13:07:39 +0000
commitea79e85fcd109a5bf5f222cece8435305fc8626a (patch)
treeb8d846b7e6a82c0dc88360ba0118187d712f160f /gtk
parent987218e144f95e1917f1eb8956fed8a712ec3a70 (diff)
downloadnetsurf-ea79e85fcd109a5bf5f222cece8435305fc8626a.tar.gz
netsurf-ea79e85fcd109a5bf5f222cece8435305fc8626a.tar.bz2
Clean up gui_window creation API.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/window.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk/window.c b/gtk/window.c
index be2049fb9..038622d19 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -663,8 +663,8 @@ static void window_destroy(GtkWidget *widget, gpointer data)
/* Core interface documented in desktop/gui.h to create a gui_window */
static struct gui_window *
gui_window_create(struct browser_window *bw,
- struct browser_window *clone,
- bool new_tab)
+ struct gui_window *existing,
+ gui_window_create_flags flags)
{
struct gui_window *g; /**< what we're creating to return */
GError* error = NULL;
@@ -693,16 +693,17 @@ gui_window_create(struct browser_window *bw,
g->bw = bw;
g->mouse.state = 0;
g->current_pointer = GUI_POINTER_DEFAULT;
- if (clone != NULL) {
- bw->scale = clone->scale;
+ if (flags & GW_CREATE_CLONE) {
+ assert(existing != NULL);
+ bw->scale = existing->bw->scale;
} else {
bw->scale = nsoption_int(scale) / 100;
}
/* attach scaffold */
- if (new_tab) {
- assert(clone != NULL);
- g->scaffold = clone->window->scaffold;
+ if (flags & GW_CREATE_TAB) {
+ assert(existing != NULL);
+ g->scaffold = existing->scaffold;
} else {
/* Now construct and attach a scaffold */
g->scaffold = nsgtk_new_scaffolding(g);