From 91deff3797ac43a8f48cf8d2ec757e6b73a286fb Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 23 Aug 2014 17:10:39 -0700 Subject: fix menu and C-q gtk exiting (closes bug #2184) --- gtk/scaffolding.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'gtk/scaffolding.c') diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 03a14e5dc..c8069c096 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. */ @@ -915,8 +901,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; } -- cgit v1.2.3