Rename property to be more neutral

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

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 194bb4a35f1a4611014650777339edaf88f8242f..03ac4c9479728bde5d6c8751115fdfdf16fce991 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -472,7 +472,7 @@ gtk_path_bar_realize (GtkWidget *widget)
 
   path_bar->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
                                            &attributes, attributes_mask);
-  gdk_window_set_user_data (path_bar->event_window, widget);
+  gtk_widget_register_window (widget, path_bar->event_window);
 }
 
 static void
@@ -482,7 +482,7 @@ gtk_path_bar_unrealize (GtkWidget *widget)
 
   path_bar = GTK_PATH_BAR (widget);
 
-  gdk_window_set_user_data (path_bar->event_window, NULL);
+  gtk_widget_unregister_window (widget, path_bar->event_window);
   gdk_window_destroy (path_bar->event_window);
   path_bar->event_window = NULL;
 
@@ -700,14 +700,16 @@ gtk_path_bar_size_allocate (GtkWidget     *widget,
   /* Now we go hide all the widgets that don't fit */
   while (list)
     {
+      child = BUTTON_DATA (list->data)->button;
       needs_reorder |= gtk_widget_get_child_visible (child) == TRUE;
-      gtk_widget_set_child_visible (BUTTON_DATA (list->data)->button, FALSE);
+      gtk_widget_set_child_visible (child, FALSE);
       list = list->prev;
     }
   for (list = first_button->next; list; list = list->next)
     {
+      child = BUTTON_DATA (list->data)->button;
       needs_reorder |= gtk_widget_get_child_visible (child) == TRUE;
-      gtk_widget_set_child_visible (BUTTON_DATA (list->data)->button, FALSE);
+      gtk_widget_set_child_visible (child, FALSE);
     }
 
   if (need_sliders || path_bar->fake_root)