This needs to return a g_free'able string, so I changed the placeholder to

	* libnautilus-extensions/nautilus-search-uri.c:
	(nautilus_search_uri_to_simple_search_criteria):
	This needs to return a g_free'able string, so I changed the
	placeholder to return NULL instead of "". (g_strdup ("") would
	also have been OK.)

	* src/nautilus-complex-search-bar.h:
	* src/nautilus-complex-search-bar.c:
	(nautilus_complex_search_bar_initialize_class),
	(nautilus_complex_search_bar_initialize),
	(nautilus_complex_search_bar_get_location),
	(nautilus_complex_search_bar_set_location):
	* src/nautilus-location-bar.c: (drag_data_received_callback),
	(drag_data_get_callback), (nautilus_location_bar_initialize_class),
	(nautilus_location_bar_initialize),
	(nautilus_location_bar_set_location),
	(nautilus_location_bar_get_location):
	* src/nautilus-navigation-bar.h:
	* src/nautilus-navigation-bar.c:
	(nautilus_navigation_bar_initialize_class),
	(nautilus_navigation_bar_get_location),
	(nautilus_navigation_bar_location_changed):
	* src/nautilus-search-bar.h:
	* src/nautilus-search-bar.c:
	(nautilus_search_bar_initialize_class),
	(nautilus_search_bar_initialize):
	* src/nautilus-simple-search-bar.h:
	* src/nautilus-simple-search-bar.c:
	(nautilus_simple_search_bar_initialize_class),
	(nautilus_simple_search_bar_initialize),
	(nautilus_simple_search_bar_set_location),
	(nautilus_simple_search_bar_get_location):
	* src/nautilus-switchable-navigation-bar.c:
	(nautilus_switchable_navigation_bar_initialize),
	(nautilus_switchable_navigation_bar_set_mode):
	* src/nautilus-switchable-search-bar.h:
	* src/nautilus-switchable-search-bar.c:
	(nautilus_switchable_search_bar_initialize_class),
	(nautilus_switchable_search_bar_set_mode),
	(search_activated_callback),
	(nautilus_switchable_search_bar_get_location),
	(nautilus_switchable_search_bar_set_location):
	Got rid of set_search_controls since set_location does exactly the
	same thing. Changed to use get_location in the
	NautilusNavigationBar base class instead of having lots of
	separate get_location. Fixed bug where get_location would return a
	non-g_strdup'd string, which callers would then g_free. Also
	changed to use simpler version of location_changed since the
	navigation bar can now get the location easily for itself so the
	subclasses need not do it. Callbacks now can call
	nautilus_navigation_bar_location_changed directly. Removed some
	empty destroy functions in classes where they are likely to be
	empty forever.

	* src/nautilus-window.c: (goto_uri_callback): Whitespace.

1 files changed, 8 insertions, 23 deletions

diff --git a/src/nautilus-switchable-navigation-bar.c b/src/nautilus-switchable-navigation-bar.c
index b3025d149..a2704b0d8 100644
--- a/src/nautilus-switchable-navigation-bar.c
+++ b/src/nautilus-switchable-navigation-bar.c
@@ -44,10 +44,6 @@ enum {
 static guint signals[LAST_SIGNAL];
 
 
-static void child_location_changed_callback                      (NautilusNavigationBar           *navigation_bar,
-								 const char                      *location,
-								 NautilusSwitchableNavigationBar *bar);
-
 static void nautilus_switchable_navigation_bar_set_location     (NautilusNavigationBar *bar,
 								 const char            *location);
 
@@ -100,15 +96,14 @@ nautilus_switchable_navigation_bar_initialize (NautilusSwitchableNavigationBar *
 	bar->location_bar = nautilus_location_bar_new ();
 	bar->search_bar = nautilus_switchable_search_bar_new ();
 
-	gtk_signal_connect (GTK_OBJECT (bar->location_bar),
-			    "location_changed",
-			    (GtkSignalFunc) child_location_changed_callback,
-			    bar);
-
-	gtk_signal_connect (GTK_OBJECT (bar->search_bar),
-			    "location_changed",
-			    (GtkSignalFunc) child_location_changed_callback,
-			    bar);
+	gtk_signal_connect_object (GTK_OBJECT (bar->location_bar),
+				   "location_changed",
+				   nautilus_navigation_bar_location_changed,
+				   GTK_OBJECT (bar));
+	gtk_signal_connect_object (GTK_OBJECT (bar->search_bar),
+				   "location_changed",
+				   nautilus_navigation_bar_location_changed,
+				   GTK_OBJECT (bar));
 	
 	gtk_box_pack_start  (GTK_BOX (hbox), bar->location_bar, TRUE, TRUE,
 			     0);
@@ -151,16 +146,6 @@ nautilus_switchable_navigation_bar_set_mode (NautilusSwitchableNavigationBar
 }
 
 static void
-child_location_changed_callback (NautilusNavigationBar           *navigation_bar,
-				 const char                      *location,
-				 NautilusSwitchableNavigationBar *bar)
-{
-	nautilus_navigation_bar_location_changed (NAUTILUS_NAVIGATION_BAR (bar),
-						  location);
-}
-
-
-static void
 nautilus_switchable_navigation_bar_set_location (NautilusNavigationBar *navigation_bar,
 						 const char *location)
 {