[nautilus] window: remove nautilus_window_show_window()



commit b5316226924feb948de5f372962c7174ff8fa10d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jan 2 00:27:03 2012 +0100

    window: remove nautilus_window_show_window()
    
    Fold it into the only caller, and simplify its code.

 src/nautilus-window.c |   29 ++++++++---------------------
 src/nautilus-window.h |    1 -
 2 files changed, 8 insertions(+), 22 deletions(-)
---
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index b66eb2d..b316f84 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -751,26 +751,6 @@ nautilus_window_finalize (GObject *object)
 }
 
 void
-nautilus_window_show_window (NautilusWindow    *window)
-{
-	NautilusWindowSlot *slot;
-	NautilusWindowPane *pane;
-	GList *l, *walk;
-
-	for (walk = window->details->panes; walk; walk = walk->next) {
-		pane = walk->data;
-		for (l = pane->slots; l != NULL; l = l->next) {
-			slot = l->data;
-
-			nautilus_window_slot_update_title (slot);
-			nautilus_window_slot_update_icon (slot);
-		}
-	}
-
-	gtk_widget_show (GTK_WIDGET (window));
-}
-
-void
 nautilus_window_view_visible (NautilusWindow *window,
 			      NautilusView *view)
 {
@@ -813,12 +793,19 @@ nautilus_window_view_visible (NautilusWindow *window,
 		if (!gtk_widget_get_visible (GTK_WIDGET (pane))) {
 			return;
 		}
+
+		for (l = pane->slots; l != NULL; l = l->next) {
+			slot = l->data;
+
+			nautilus_window_slot_update_title (slot);
+			nautilus_window_slot_update_icon (slot);
+		}
 	}
 
 	nautilus_window_pane_grab_focus (window->details->active_pane);
 
 	/* All slots and panes visible, show window */
-	nautilus_window_show_window (window);
+	gtk_widget_show (GTK_WIDGET (window));
 }
 
 static void
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index ba43138..cfb5729 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -107,7 +107,6 @@ struct NautilusWindow {
 };
 
 GType            nautilus_window_get_type             (void);
-void             nautilus_window_show_window          (NautilusWindow    *window);
 void             nautilus_window_close                (NautilusWindow    *window);
 
 void             nautilus_window_connect_content_view (NautilusWindow    *window,



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