filechooserbutton: Keep track of the current_folder while the dialog is inactive

[~andy/gtk] / gtk / gtkscrolledwindow.c

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index be780d417a6db2ff76f976436e478fab97be196e..0095072ea606ec8404c90afdb1dc1df2b980adab 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -3102,8 +3102,7 @@ gtk_scrolled_window_remove (GtkContainer *container,
  * #GtkScrollable interface.
  *
  * Deprecated: 3.8: gtk_container_add() will now automatically add
- * a #GtkViewport if the child doesn't implement #GtkScrollable. This
- * function now just calls gtk_container_add()
+ * a #GtkViewport if the child doesn't implement #GtkScrollable.
  */
 void
 gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
@@ -3393,7 +3392,7 @@ gtk_scrolled_window_realize (GtkWidget *widget)
   scrolled_window->priv->overshoot_window =
     gdk_window_new (gtk_widget_get_parent_window (widget),
                     &attributes, attributes_mask);
-  gdk_window_set_user_data (scrolled_window->priv->overshoot_window, widget);
+  gtk_widget_register_window (widget, scrolled_window->priv->overshoot_window);
 
   child_widget = gtk_bin_get_child (GTK_BIN (widget));
 
@@ -3409,7 +3408,7 @@ gtk_scrolled_window_unrealize (GtkWidget *widget)
 {
   GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
 
-  gdk_window_set_user_data (scrolled_window->priv->overshoot_window, NULL);
+  gtk_widget_unregister_window (widget, scrolled_window->priv->overshoot_window);
   gdk_window_destroy (scrolled_window->priv->overshoot_window);
   scrolled_window->priv->overshoot_window = NULL;