summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-08-26 17:59:19 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2014-08-26 17:59:19 +0100
commitb7b70a3ca89f2bce90dac363967b31477794b157 (patch)
treed964670aae908aa9c471433fefc36bccd3945faa /gtk
parent5bed515e68b22024992fe1cda336c7b8afa78c6f (diff)
parent2eb86b9096add2523d1c3a46264abfa420ff6a88 (diff)
downloadnetsurf-b7b70a3ca89f2bce90dac363967b31477794b157.tar.gz
netsurf-b7b70a3ca89f2bce90dac363967b31477794b157.tar.bz2
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gui.c1
-rw-r--r--gtk/scaffolding.c26
-rw-r--r--gtk/scaffolding.h5
3 files changed, 10 insertions, 22 deletions
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 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;
}
diff --git a/gtk/scaffolding.h b/gtk/scaffolding.h
index fcf6d3c9b..e7d945ebc 100644
--- a/gtk/scaffolding.h
+++ b/gtk/scaffolding.h
@@ -193,11 +193,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
*
* widgets altered in arrays: