[nautilus] window: cleanup window_pane_zoom madness

[Cosimo Cecchi <cosimoc src gnome org>]

commit c4d48d522dccb915041c9521789a47d2bea0e1e4
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Feb 15 19:53:24 2011 -0500

    window: cleanup window_pane_zoom madness

 src/nautilus-window-pane.c |   61 --------------------------------------------
 src/nautilus-window-pane.h |    4 ---
 src/nautilus-window.c      |   28 +++++++++++--------
 3 files changed, 16 insertions(+), 77 deletions(-)
---
diff --git a/src/nautilus-window-pane.c b/src/nautilus-window-pane.c
index ecb9308..f5e740b 100644
--- a/src/nautilus-window-pane.c
+++ b/src/nautilus-window-pane.c
@@ -63,67 +63,6 @@ nautilus_window_pane_show (NautilusWindowPane *pane)
 }
 
 void
-nautilus_window_pane_zoom_in (NautilusWindowPane *pane)
-{
-	NautilusWindowSlot *slot;
-
-	g_assert (pane != NULL);
-
-	nautilus_window_set_active_pane (pane->window, pane);
-
-	slot = pane->active_slot;
-	if (slot->content_view != NULL) {
-		nautilus_view_bump_zoom_level (slot->content_view, 1);
-	}
-}
-
-void
-nautilus_window_pane_zoom_to_level (NautilusWindowPane *pane,
-			       NautilusZoomLevel level)
-{
-	NautilusWindowSlot *slot;
-
-	g_assert (pane != NULL);
-
-	nautilus_window_set_active_pane (pane->window, pane);
-
-	slot = pane->active_slot;
-	if (slot->content_view != NULL) {
-		nautilus_view_zoom_to_level (slot->content_view, level);
-	}
-}
-
-void
-nautilus_window_pane_zoom_out (NautilusWindowPane *pane)
-{
-	NautilusWindowSlot *slot;
-
-	g_assert (pane != NULL);
-
-	nautilus_window_set_active_pane (pane->window, pane);
-
-	slot = pane->active_slot;
-	if (slot->content_view != NULL) {
-		nautilus_view_bump_zoom_level (slot->content_view, -1);
-	}
-}
-
-void
-nautilus_window_pane_zoom_to_default (NautilusWindowPane *pane)
-{
-	NautilusWindowSlot *slot;
-
-	g_assert (pane != NULL);
-
-	nautilus_window_set_active_pane (pane->window, pane);
-
-	slot = pane->active_slot;
-	if (slot->content_view != NULL) {
-		nautilus_view_restore_default_zoom_level (slot->content_view);
-	}
-}
-
-void
 nautilus_window_pane_slot_close (NautilusWindowPane *pane, NautilusWindowSlot *slot)
 {
 	NautilusWindowSlot *next_slot;
diff --git a/src/nautilus-window-pane.h b/src/nautilus-window-pane.h
index 0f616f4..3cc7aba 100644
--- a/src/nautilus-window-pane.h
+++ b/src/nautilus-window-pane.h
@@ -79,10 +79,6 @@ NautilusWindowPane *nautilus_window_pane_new (NautilusWindow *window);
 
 
 void nautilus_window_pane_show (NautilusWindowPane *pane);
-void nautilus_window_pane_zoom_in (NautilusWindowPane *pane);
-void nautilus_window_pane_zoom_to_level (NautilusWindowPane *pane, NautilusZoomLevel level);
-void nautilus_window_pane_zoom_out (NautilusWindowPane *pane);
-void nautilus_window_pane_zoom_to_default (NautilusWindowPane *pane);
 void nautilus_window_pane_sync_location_widgets (NautilusWindowPane *pane);
 void nautilus_window_pane_sync_search_widgets  (NautilusWindowPane *pane);
 void nautilus_window_pane_set_active (NautilusWindowPane *pane, gboolean is_active);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 3c53732..626dcea 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -354,37 +354,41 @@ nautilus_window_prompt_for_location (NautilusWindow *window,
                          prompt_for_location, (window, initial));
 }
 
+static NautilusView *
+nautilus_window_get_active_view (NautilusWindow *window)
+{
+	NautilusWindowSlot *slot;
+	NautilusView *view;
+
+	slot = window->details->active_pane->active_slot;
+	view = slot->content_view;
+
+	return view;
+}
+
 void
 nautilus_window_zoom_in (NautilusWindow *window)
 {
-	g_assert (window != NULL);
-
-	nautilus_window_pane_zoom_in (window->details->active_pane);
+	nautilus_view_bump_zoom_level (nautilus_window_get_active_view (window), 1);
 }
 
 void
 nautilus_window_zoom_to_level (NautilusWindow *window,
 			       NautilusZoomLevel level)
 {
-	g_assert (window != NULL);
-
-	nautilus_window_pane_zoom_to_level (window->details->active_pane, level);
+	nautilus_view_zoom_to_level (nautilus_window_get_active_view (window), level);
 }
 
 void
 nautilus_window_zoom_out (NautilusWindow *window)
 {
-	g_assert (window != NULL);
-
-	nautilus_window_pane_zoom_out (window->details->active_pane);
+	nautilus_view_bump_zoom_level (nautilus_window_get_active_view (window), -1);
 }
 
 void
 nautilus_window_zoom_to_default (NautilusWindow *window)
 {
-	g_assert (window != NULL);
-
-	nautilus_window_pane_zoom_to_default (window->details->active_pane);
+	nautilus_view_restore_default_zoom_level (nautilus_window_get_active_view (window));
 }
 
 /* Code should never force the window taller than this size.