diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-08-26 17:59:19 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-08-26 17:59:19 +0100 |
| commit | b7b70a3ca89f2bce90dac363967b31477794b157 (patch) | |
| tree | d964670aae908aa9c471433fefc36bccd3945faa /gtk/scaffolding.c | |
| parent | 5bed515e68b22024992fe1cda336c7b8afa78c6f (diff) | |
| parent | 2eb86b9096add2523d1c3a46264abfa420ff6a88 (diff) | |
| download | netsurf-b7b70a3ca89f2bce90dac363967b31477794b157.tar.gz netsurf-b7b70a3ca89f2bce90dac363967b31477794b157.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'gtk/scaffolding.c')
| -rw-r--r-- | gtk/scaffolding.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index b57db3b69..93cd7f768 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -265,20 +265,6 @@ static gboolean scaffolding_window_delete_event(GtkWidget *widget, return TRUE; } -/* exported interface documented in gtk_scaffold.h */ -void nsgtk_scaffolding_destroy(void) -{ - struct nsgtk_scaffolding *gs; - - gs = scaf_list; - while (gs != NULL) { - LOG(("destroying scaffold: %p", gs)); - if (gtk_widget_in_destruction(GTK_WIDGET(gs->window)) != TRUE) { - gtk_widget_destroy(GTK_WIDGET(gs->window)); - } - } -} - /** * Update the back and forward button sensitivity. */ @@ -918,8 +904,16 @@ MULTIHANDLER(closewindow) MULTIHANDLER(quit) { - if (nsgtk_check_for_downloads(g->window) == false) - netsurf_quit = true; + struct nsgtk_scaffolding *gs; + + if (nsgtk_check_for_downloads(g->window) == false) { + gs = scaf_list; + while (gs != NULL) { + gtk_widget_destroy(GTK_WIDGET(gs->window)); + gs = gs->next; + } + } + return TRUE; } |