[nautilus] window: misc cleanups

[Cosimo Cecchi <cosimoc src gnome org>]

commit 5592a3f2229a59bcb3d6eb6400d562b1c17395cb
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed May 30 11:03:45 2012 -0400

    window: misc cleanups

 src/nautilus-notebook.c   |    2 --
 src/nautilus-search-bar.c |    6 ------
 src/nautilus-search-bar.h |    1 -
 src/nautilus-window.c     |   13 +++++--------
 4 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/src/nautilus-notebook.c b/src/nautilus-notebook.c
index 671695a..1131ec4 100644
--- a/src/nautilus-notebook.c
+++ b/src/nautilus-notebook.c
@@ -41,8 +41,6 @@
 #define AFTER_ALL_TABS -1
 #define NOT_IN_APP_WINDOWS -2
 
-static void nautilus_notebook_init		 (NautilusNotebook *notebook);
-static void nautilus_notebook_class_init	 (NautilusNotebookClass *klass);
 static int  nautilus_notebook_insert_page	 (GtkNotebook *notebook,
 					  GtkWidget *child,
 					  GtkWidget *tab_label,
diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
index 61ae325..97b7951 100644
--- a/src/nautilus-search-bar.c
+++ b/src/nautilus-search-bar.c
@@ -175,12 +175,6 @@ nautilus_search_bar_init (NautilusSearchBar *bar)
 }
 
 GtkWidget *
-nautilus_search_bar_get_entry (NautilusSearchBar *bar)
-{
-	return bar->details->entry;
-}
-
-GtkWidget *
 nautilus_search_bar_borrow_entry (NautilusSearchBar *bar)
 {
 	GtkBindingSet *binding_set;
diff --git a/src/nautilus-search-bar.h b/src/nautilus-search-bar.h
index c55e1b7..bb8674f 100644
--- a/src/nautilus-search-bar.h
+++ b/src/nautilus-search-bar.h
@@ -56,7 +56,6 @@ typedef struct {
 GType      nautilus_search_bar_get_type     	(void);
 GtkWidget* nautilus_search_bar_new          	(void);
 
-GtkWidget *    nautilus_search_bar_get_entry     (NautilusSearchBar *bar);
 GtkWidget *    nautilus_search_bar_borrow_entry  (NautilusSearchBar *bar);
 void           nautilus_search_bar_return_entry  (NautilusSearchBar *bar);
 void           nautilus_search_bar_grab_focus    (NautilusSearchBar *bar);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 26c362a..c038daf 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1240,21 +1240,18 @@ create_notebook (NautilusWindow *window)
 	GtkWidget *notebook;
 
 	notebook = g_object_new (NAUTILUS_TYPE_NOTEBOOK, NULL);
-	g_signal_connect (notebook,
-			  "tab-close-request",
+	g_signal_connect (notebook, "tab-close-request",
 			  G_CALLBACK (notebook_tab_close_requested),
 			  window);
-	g_signal_connect_after (notebook,
-				"button_press_event",
-				G_CALLBACK (notebook_button_press_cb),
-				window);
 	g_signal_connect (notebook, "popup-menu",
 			  G_CALLBACK (notebook_popup_menu_cb),
 			  window);
-	g_signal_connect (notebook,
-			  "switch-page",
+	g_signal_connect (notebook, "switch-page",
 			  G_CALLBACK (notebook_switch_page_cb),
 			  window);
+	g_signal_connect_after (notebook, "button-press-event",
+				G_CALLBACK (notebook_button_press_cb),
+				window);
 
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
 	gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);