summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-05-20 09:16:35 -0400
committerMatthias Clasen <mclasen@redhat.com>2016-05-20 09:23:51 -0400
commitca8d51e6d0f78cc170cc212dd7ef6664d2e662f4 (patch)
tree4ec59b13b1b7f64325fe168f625dd4ee07e655f9
parentcdb3271346e18e87432e0993dec35cde6a917b08 (diff)
downloadgtk+-ca8d51e6d0f78cc170cc212dd7ef6664d2e662f4.tar.gz
Revert "scrolledwindow: Remove child before destroying self"
This reverts commit dcb4b48b29559ca632bb020a3b8eb2b9188b02e7. This was causing crashes in the filechooser in some applications. https://bugzilla.gnome.org/show_bug.cgi?id=766694
-rw-r--r--gtk/gtkscrolledwindow.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 0918d72315..1b52082296 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -2672,11 +2672,6 @@ gtk_scrolled_window_destroy (GtkWidget *widget)
{
GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
GtkScrolledWindowPrivate *priv = scrolled_window->priv;
- GtkWidget *child;
-
- child = gtk_bin_get_child (GTK_BIN (widget));
- if (child)
- gtk_container_remove (GTK_CONTAINER (widget), child);
remove_indicator (scrolled_window, &priv->hindicator);
remove_indicator (scrolled_window, &priv->vindicator);