[nautilus] window: simplify code



commit dff4f7755c8521a8669ccf7b301683375341ace3
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 23 10:18:27 2012 -0400

    window: simplify code

 src/nautilus-window-private.h |    1 -
 src/nautilus-window-slot.c    |    4 ++--
 src/nautilus-window.c         |    9 ---------
 3 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index e20d835..ef7b26b 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -144,7 +144,6 @@ NautilusWindowPane * nautilus_window_get_active_pane                     (Nautil
 /* sync window GUI with current slot. Used when changing slots,
  * and when updating the slot state.
  */
-void nautilus_window_sync_status           (NautilusWindow *window);
 void nautilus_window_sync_allow_stop       (NautilusWindow *window,
 					    NautilusWindowSlot *slot);
 void nautilus_window_sync_title            (NautilusWindow *window,
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index c2b3cfc..7644056 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -139,7 +139,7 @@ real_active (NautilusWindowSlot *slot)
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (pane->notebook), page_num);
 
 	/* sync window to new slot */
-	nautilus_window_sync_status (window);
+	nautilus_window_push_status (window, slot->status_text);
 	nautilus_window_sync_allow_stop (window, slot);
 	nautilus_window_sync_title (window, slot);
 	nautilus_window_sync_zoom_widgets (window);
@@ -571,7 +571,7 @@ nautilus_window_slot_set_status (NautilusWindowSlot *slot,
 
 	window = nautilus_window_slot_get_window (slot);
 	if (slot == nautilus_window_get_active_slot (window)) {
-		nautilus_window_sync_status (window);
+		nautilus_window_push_status (window, slot->status_text);
 	}
 }
 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 45c33d7..a141465 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -163,15 +163,6 @@ nautilus_window_push_status (NautilusWindow *window,
 }
 
 void
-nautilus_window_sync_status (NautilusWindow *window)
-{
-	NautilusWindowSlot *slot;
-
-	slot = nautilus_window_get_active_slot (window);
-	nautilus_window_push_status (window, slot->status_text);
-}
-
-void
 nautilus_window_go_to (NautilusWindow *window, GFile *location)
 {
 	g_return_if_fail (NAUTILUS_IS_WINDOW (window));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]