[nautilus] window: just use nautilus_view_set_is_active()

[Cosimo Cecchi <cosimoc src gnome org>]

commit d83173021f5adc99b5eec468e0c4d5ddfeed4218
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Feb 16 16:11:28 2011 -0500

    window: just use nautilus_view_set_is_active()
    
    Don't roundtrip through NautilusWindowSlot, as that's what it would do
    anyway.

 src/nautilus-window-pane.c |   12 +++++++++---
 src/nautilus-window-slot.c |   19 -------------------
 src/nautilus-window-slot.h |    2 --
 src/nautilus-window.c      |    4 +---
 4 files changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/src/nautilus-window-pane.c b/src/nautilus-window-pane.c
index d372335..2e72226 100644
--- a/src/nautilus-window-pane.c
+++ b/src/nautilus-window-pane.c
@@ -119,16 +119,22 @@ nautilus_window_pane_get_slot_for_content_box (NautilusWindowPane *pane,
 }
 
 void
-nautilus_window_pane_set_active (NautilusWindowPane *pane, gboolean is_active)
+nautilus_window_pane_set_active (NautilusWindowPane *pane,
+				 gboolean is_active)
 {
+	NautilusView *view;
+
 	if (is_active == pane->is_active) {
 		return;
 	}
 
 	pane->is_active = is_active;
 
-	/* notify the current slot about its activity state (so that it can e.g. modify the bg color) */
-	nautilus_window_slot_is_in_active_pane (pane->active_slot, is_active);
+	/* notify the current view about its activity state */
+	if (pane->active_slot != NULL) {
+		view = nautilus_window_slot_get_current_view (pane->active_slot);
+		nautilus_view_set_is_active (view, is_active);
+	}
 
 	EEL_CALL_METHOD (NAUTILUS_WINDOW_PANE_CLASS, pane,
 			 set_active, (pane, is_active));
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 42647e3..6402853 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -384,25 +384,6 @@ nautilus_window_slot_update_icon (NautilusWindowSlot *slot)
 }
 
 void
-nautilus_window_slot_is_in_active_pane (NautilusWindowSlot *slot,
-					gboolean is_active)
-{
-	/* NULL is valid, and happens during init */
-	if (!slot) {
-		return;
-	}
-
-	/* it may also be that the content is not a valid directory view during init */
-	if (slot->content_view != NULL) {
-		nautilus_view_set_is_active (slot->content_view, is_active);
-	}
-
-	if (slot->new_content_view != NULL) {
-		nautilus_view_set_is_active (slot->new_content_view, is_active);
-	}
-}
-
-void
 nautilus_window_slot_set_content_view_widget (NautilusWindowSlot *slot,
 					      NautilusView *new_view)
 {
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index c5f815a..b23fce3 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -175,8 +175,6 @@ void    nautilus_window_slot_add_extra_location_widget     (NautilusWindowSlot *
 							    GtkWidget       *widget);
 void    nautilus_window_slot_remove_extra_location_widgets (NautilusWindowSlot *slot);
 
-void    nautilus_window_slot_is_in_active_pane (NautilusWindowSlot *slot, gboolean is_active);
-
 NautilusView * nautilus_window_slot_get_current_view     (NautilusWindowSlot *slot);
 char           * nautilus_window_slot_get_current_uri      (NautilusWindowSlot *slot);
 NautilusWindow * nautilus_window_slot_get_window           (NautilusWindowSlot *slot);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 9f74e36..ad47291 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -586,9 +586,7 @@ nautilus_window_view_visible (NautilusWindow *window,
 	g_return_if_fail (NAUTILUS_IS_WINDOW (window));
 
 	slot = nautilus_window_get_slot_for_view (window, view);
-
-	/* Ensure we got the right active state for newly added panes */
-	nautilus_window_slot_is_in_active_pane (slot, slot->pane->is_active);
+	nautilus_view_set_is_active (view, slot->pane->is_active);
 
 	if (slot->visible) {
 		return;