summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2010-08-18 13:07:00 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2010-08-18 13:33:12 +0200
commitf8e3aae7ead07b1006690fa09b6344626bf58fb0 (patch)
tree8a4ea0e5ef7b8a6d9873e07f7b1dd8ee64cbcec0
parentaa6a3c7a17832b8811a417a5694447f1566c92dc (diff)
downloadnautilus-f8e3aae7ead07b1006690fa09b6344626bf58fb0.tar.gz
Revert "Add a border around info bars (#621366)."
This reverts commit 453a69c0c49dda691cdf47c249ebe699f3ef79bf.
-rw-r--r--src/file-manager/fm-directory-view.c1
-rw-r--r--src/nautilus-window-slot.c23
-rw-r--r--src/nautilus-window-slot.h1
3 files changed, 7 insertions, 18 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index be9f71886..3b77fcba9 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1952,6 +1952,7 @@ fm_directory_view_init (FMDirectoryView *view)
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (view), NULL);
gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (view), NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), GTK_SHADOW_IN);
set_up_scripts_directory_global ();
scripts_directory = nautilus_directory_get_by_uri (scripts_directory_uri);
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index df3c16492..fbef40d0b 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -172,35 +172,26 @@ nautilus_window_slot_inactive (NautilusWindowSlot *slot)
static void
nautilus_window_slot_init (NautilusWindowSlot *slot)
{
- GtkWidget *content_box, *eventbox, *extras_vbox, *frame, *hsep;
+ GtkWidget *content_box, *eventbox, *extras_vbox;
content_box = gtk_vbox_new (FALSE, 0);
slot->content_box = content_box;
gtk_widget_show (content_box);
- frame = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
- gtk_box_pack_start (GTK_BOX (content_box), frame, TRUE, TRUE, 0);
- gtk_widget_show (frame);
-
- slot->view_box = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (frame), slot->view_box);
- gtk_widget_show (slot->view_box);
-
eventbox = gtk_event_box_new ();
slot->extra_location_event_box = eventbox;
gtk_widget_set_name (eventbox, "nautilus-extra-view-widget");
- gtk_box_pack_start (GTK_BOX (slot->view_box), eventbox, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (content_box), eventbox, FALSE, FALSE, 0);
+
extras_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (extras_vbox), 6);
slot->extra_location_widgets = extras_vbox;
gtk_container_add (GTK_CONTAINER (eventbox), extras_vbox);
gtk_widget_show (extras_vbox);
- hsep = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (slot->view_box), hsep, FALSE, FALSE, 0);
- slot->extra_location_separator = hsep;
+ slot->view_box = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_box), slot->view_box, TRUE, TRUE, 0);
+ gtk_widget_show (slot->view_box);
slot->title = g_strdup (_("Loading..."));
}
@@ -536,7 +527,6 @@ nautilus_window_slot_remove_extra_location_widgets (NautilusWindowSlot *slot)
remove_all,
slot->extra_location_widgets);
gtk_widget_hide (slot->extra_location_event_box);
- gtk_widget_hide (slot->extra_location_separator);
}
void
@@ -546,7 +536,6 @@ nautilus_window_slot_add_extra_location_widget (NautilusWindowSlot *slot,
gtk_box_pack_start (GTK_BOX (slot->extra_location_widgets),
widget, TRUE, TRUE, 0);
gtk_widget_show (slot->extra_location_event_box);
- gtk_widget_show (slot->extra_location_separator);
}
void
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 76228ca29..ce276d859 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -74,7 +74,6 @@ struct NautilusWindowSlot {
GtkWidget *content_box;
GtkWidget *extra_location_event_box;
GtkWidget *extra_location_widgets;
- GtkWidget *extra_location_separator;
GtkWidget *view_box;
NautilusView *content_view;