From 91deff3797ac43a8f48cf8d2ec757e6b73a286fb Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sat, 23 Aug 2014 17:10:39 -0700
Subject: fix menu and C-q gtk exiting (closes bug #2184)

---
 gtk/gui.c         |  1 -
 gtk/scaffolding.c | 26 ++++++++++----------------
 gtk/scaffolding.h |  5 -----
 3 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'gtk')

diff --git a/gtk/gui.c b/gtk/gui.c
index bbe6cbaf2..6fb2a4125 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -539,7 +539,6 @@ static void gui_quit(void)
 	LOG(("Quitting GUI"));
 
 	/* Ensure all scaffoldings are destroyed before we go into exit */
-	nsgtk_scaffolding_destroy();
 	nsgtk_download_destroy();
 	urldb_save_cookies(nsoption_charp(cookie_jar));
 	urldb_save(nsoption_charp(url_file));
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;
 }
 
diff --git a/gtk/scaffolding.h b/gtk/scaffolding.h
index fcf6d3c9b..e7d945ebc 100644
--- a/gtk/scaffolding.h
+++ b/gtk/scaffolding.h
@@ -192,11 +192,6 @@ void nsgtk_scaffolding_toggle_search_bar_visibility(struct nsgtk_scaffolding *g)
  */
 void nsgtk_scaffolding_set_top_level(struct gui_window *g);
 
-/**
- * Destroy all scaffolds.
- */
-void nsgtk_scaffolding_destroy(void);
-
 /**
  * update the sensitivity of context sensitive UI elements
  *
-- 
cgit v1.2.3