[nautilus] desktop: ensure we don't set GTK_SHADOW_IN on the desktop view

[Cosimo Cecchi <cosimoc src gnome org>]

commit c95771c67200355366110546d553616982cd96c9
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jul 16 11:49:31 2012 -0400

    desktop: ensure we don't set GTK_SHADOW_IN on the desktop view
    
    We don't want borders around the desktop view.

 src/nautilus-desktop-icon-view.c |    3 ---
 src/nautilus-view.c              |    3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-desktop-icon-view.c b/src/nautilus-desktop-icon-view.c
index f9b9d52..1729510 100644
--- a/src/nautilus-desktop-icon-view.c
+++ b/src/nautilus-desktop-icon-view.c
@@ -589,9 +589,6 @@ nautilus_desktop_icon_view_init (NautilusDesktopIconView *desktop_icon_view)
 	gtk_adjustment_set_value (hadj, 0);
 	gtk_adjustment_set_value (vadj, 0);
 
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (desktop_icon_view),
-					     GTK_SHADOW_NONE);
-
 	nautilus_view_ignore_hidden_file_preferences
 		(NAUTILUS_VIEW (desktop_icon_view));
 
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 49e60c9..f0ee3d5 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -9739,7 +9739,8 @@ window_slots_changed (NautilusWindow *window,
 	 * notebook, since when the notebook has tabs, it will draw its own
 	 * border.
 	 */
-	if (g_list_length (slots) > 1) {
+	if (g_list_length (slots) > 1 ||
+	    NAUTILUS_IS_DESKTOP_ICON_VIEW (view)) {
 		gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), GTK_SHADOW_NONE);
 	} else {
 		gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), GTK_SHADOW_IN);