diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2012-01-09 15:48:01 +0100 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2012-01-09 17:22:47 -0500 |
| commit | ec391bf3de51ab4ee7f510ab6570fc240a7754c0 (patch) | |
| tree | 53e204db3ad4d02d61aa26db48148249dbd5c677 /src/nautilus-window-slot.c | |
| parent | 283c4903139dc08b7b69afa117870e143cc64137 (diff) | |
| download | nautilus-ec391bf3de51ab4ee7f510ab6570fc240a7754c0.tar.gz | |
slot: make NautilusWindowSlot a GtkBox
Simplifies management of the slot quite a bit.
Diffstat (limited to 'src/nautilus-window-slot.c')
| -rw-r--r-- | src/nautilus-window-slot.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index 54dcb78f6..69ccebfae 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -36,7 +36,7 @@ #include <eel/eel-string.h> -G_DEFINE_TYPE (NautilusWindowSlot, nautilus_window_slot, G_TYPE_OBJECT); +G_DEFINE_TYPE (NautilusWindowSlot, nautilus_window_slot, GTK_TYPE_BOX); enum { ACTIVE, @@ -130,7 +130,7 @@ real_active (NautilusWindowSlot *slot) window = nautilus_window_slot_get_window (slot); pane = slot->pane; page_num = gtk_notebook_page_num (GTK_NOTEBOOK (pane->notebook), - slot->content_box); + GTK_WIDGET (slot)); g_assert (page_num >= 0); gtk_notebook_set_current_page (GTK_NOTEBOOK (pane->notebook), page_num); @@ -171,22 +171,22 @@ floating_bar_action_cb (NautilusFloatingBar *floating_bar, static void nautilus_window_slot_init (NautilusWindowSlot *slot) { - GtkWidget *content_box, *extras_vbox; + GtkWidget *extras_vbox; - content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - slot->content_box = content_box; - gtk_widget_show (content_box); + gtk_orientable_set_orientation (GTK_ORIENTABLE (slot), + GTK_ORIENTATION_VERTICAL); + gtk_widget_show (GTK_WIDGET (slot)); extras_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); slot->extra_location_widgets = extras_vbox; - gtk_box_pack_start (GTK_BOX (content_box), extras_vbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (slot), extras_vbox, FALSE, FALSE, 0); gtk_widget_show (extras_vbox); slot->view_overlay = gtk_overlay_new (); gtk_widget_add_events (slot->view_overlay, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); - gtk_box_pack_start (GTK_BOX (content_box), slot->view_overlay, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (slot), slot->view_overlay, TRUE, TRUE, 0); gtk_widget_show (slot->view_overlay); slot->floating_bar = nautilus_floating_bar_new ("", FALSE); |