Removed notify_title_change call and removed initial_title parameter of

notify_location_change call.

32 files changed, 60 insertions, 262 deletions

diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 14d9abec7..f843667c7 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,5 +1,34 @@
 2000-03-28  John Sullivan <sullivan@eazel.com>
 
+	Maciej, Darin and I discussed the notify_title_change
+	design and decided that we didn't need it now and that
+	we should keep the API simpler by removing it, along
+	with the initial_title parameter I added to
+	notify_location_change. So out they come.
+
+	* components/help/hyperbola-nav-tree.c,
+	* components/history/ntl-history-view.c,
+	* components/html/ntl-web-browser.c,
+	* components/music/nautilus-music-view.c,
+	* components/notes/ntl-notes.c,
+	* components/sample/nautilus-sample-content-view.c,
+	* components/websearch/ntl-web-search.c,
+	* idl/nautilus.idl,
+	* libnautilus/ntl-view-frame.c,
+	* libnautilus/ntl-view-frame.h,
+	* src/ntl-view-bonobo-control.c,
+	* src/ntl-view-bonobo-subdoc.c,
+	* src/ntl-view-nautilus.c,
+	* src/ntl-view-private.h,
+	* src/ntl-view.c,
+	* src/ntl-view.h,
+	* src/ntl-window-msgs.c,
+	* src/file-manager/fm-directory-view.c: Removed notify_title_change
+	and the initial_title parameter to notify_location_change wherever
+	they reared their ugly heads.
+
+2000-03-28  John Sullivan <sullivan@eazel.com>
+
 	* libnautilus/nautilus-icon-container.c:
 	(keyboard_move_to): The behavior of the Control key got
 	accidentally reversed in a recent cleanup.
diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c
index 032ac501d..f0e6a1d48 100644
--- a/components/help/hyperbola-nav-tree.c
+++ b/components/help/hyperbola-nav-tree.c
@@ -19,7 +19,6 @@ static void hyperbola_navigation_tree_select_row(GtkCTree *ctree,
 						 HyperbolaNavigationTree *view);
 static void hyperbola_navigation_tree_notify_location_change (NautilusViewFrame *view_frame,
 							      Nautilus_NavigationInfo *navi,
-							      const char *initial_title,
 							      HyperbolaNavigationTree *hview);
 
 typedef struct {
@@ -103,7 +102,6 @@ hyperbola_navigation_tree_new(void)
 static void
 hyperbola_navigation_tree_notify_location_change (NautilusViewFrame *view_frame,
 						  Nautilus_NavigationInfo *navi,
-						  const char *initial_title,
 						  HyperbolaNavigationTree *hview)
 {
   HyperbolaTreeNode *tnode;
diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c
index d93421629..fb5c9f51e 100644
--- a/components/history/nautilus-history-view.c
+++ b/components/history/nautilus-history-view.c
@@ -99,7 +99,6 @@ history_view_update_icons (GtkCList *clist)
 static void
 hyperbola_navigation_history_notify_location_change (NautilusViewFrame *view,
 						     Nautilus_NavigationInfo *loci,
-						     const char *initial_title,
 						     HistoryView *hview)
 {
   char *cols[HISTORY_VIEW_COLUMN_COUNT];
diff --git a/components/history/ntl-history-view.c b/components/history/ntl-history-view.c
index d93421629..fb5c9f51e 100644
--- a/components/history/ntl-history-view.c
+++ b/components/history/ntl-history-view.c
@@ -99,7 +99,6 @@ history_view_update_icons (GtkCList *clist)
 static void
 hyperbola_navigation_history_notify_location_change (NautilusViewFrame *view,
 						     Nautilus_NavigationInfo *loci,
-						     const char *initial_title,
 						     HistoryView *hview)
 {
   char *cols[HISTORY_VIEW_COLUMN_COUNT];
diff --git a/components/html/ntl-web-browser.c b/components/html/ntl-web-browser.c
index 00ec79002..4897f337a 100644
--- a/components/html/ntl-web-browser.c
+++ b/components/html/ntl-web-browser.c
@@ -557,7 +557,6 @@ browser_submit(GtkWidget *htmlw, const char *method, const char *url, const char
 static void
 browser_notify_location_change(NautilusViewFrame *view_frame, 
 			       Nautilus_NavigationInfo *ni, 
-			       const char *initial_title,
 			       BrowserInfo *bi)
 {
   if(ni->self_originated)
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index f64846861..a45ef2511 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -100,7 +100,6 @@ NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMusicView, nautilus_music_view, GTK_T
 static void 
 music_view_notify_location_change_cb(NautilusContentViewFrame  *view, 
 				     Nautilus_NavigationInfo   *navinfo, 
-				     const char *initial_title,
 				     NautilusMusicView *music_view);
 static void selection_callback(GtkCList * clist, int row, int column, GdkEventButton * event);
 
@@ -606,7 +605,6 @@ nautilus_music_view_load_uri (NautilusMusicView *music_view, const char *uri)
 static void
 music_view_notify_location_change_cb (NautilusContentViewFrame  *view, 
 				  Nautilus_NavigationInfo   *navinfo, 
-				  const char *initial_title,
 				  NautilusMusicView *music_view)
 {
 	Nautilus_ProgressRequestInfo pri;
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 1aa1847f9..d89412230 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -101,7 +101,6 @@ static void notes_save_metainfo(NotesView *hview)
 static void
 notes_notify_location_change (NautilusViewFrame *view,
                                 Nautilus_NavigationInfo *loci,
-                                const char *initial_title,
                                 NotesView *hview)
 { 
   if (strcmp(hview->current_uri, loci->requested_uri))
diff --git a/components/notes/ntl-notes.c b/components/notes/ntl-notes.c
index 1aa1847f9..d89412230 100644
--- a/components/notes/ntl-notes.c
+++ b/components/notes/ntl-notes.c
@@ -101,7 +101,6 @@ static void notes_save_metainfo(NotesView *hview)
 static void
 notes_notify_location_change (NautilusViewFrame *view,
                                 Nautilus_NavigationInfo *loci,
-                                const char *initial_title,
                                 NotesView *hview)
 { 
   if (strcmp(hview->current_uri, loci->requested_uri))
diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c
index fe3525d88..05c892a14 100644
--- a/components/sample/nautilus-sample-content-view.c
+++ b/components/sample/nautilus-sample-content-view.c
@@ -51,7 +51,6 @@ NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSampleContentView, nautilus_sample_co
      
 static void sample_notify_location_change_callback        (NautilusContentViewFrame  *view_frame, 
 							   Nautilus_NavigationInfo   *navinfo, 
-							   const char 		     *initial_title,
 							   NautilusSampleContentView *view);
 static void sample_merge_bonobo_items_callback 		  (BonoboObject 	     *control, 
 							   gboolean 		      state, 
@@ -146,7 +145,6 @@ nautilus_sample_content_view_load_uri (NautilusSampleContentView *view,
 static void
 sample_notify_location_change_callback (NautilusContentViewFrame  *view_frame, 
 				  	Nautilus_NavigationInfo   *navinfo, 
-				  	const char		  *initial_title,
 				  	NautilusSampleContentView *view)
 {
 	Nautilus_ProgressRequestInfo pri;
diff --git a/components/websearch/ntl-web-search.c b/components/websearch/ntl-web-search.c
index edd1a1248..8e814be18 100644
--- a/components/websearch/ntl-web-search.c
+++ b/components/websearch/ntl-web-search.c
@@ -55,7 +55,6 @@ static int object_count = 0;
 static void
 web_search_notify_location_change (NautilusViewFrame *view,
                                 Nautilus_NavigationInfo *loci,
-                                const char *initial_title,
                                 WebSearchView *hview)
 {
 }
diff --git a/idl/nautilus.idl b/idl/nautilus.idl
index 263d66783..ae73d693d 100644
--- a/idl/nautilus.idl
+++ b/idl/nautilus.idl
@@ -42,11 +42,9 @@ module Nautilus {
 	interface View : ::Bonobo::Unknown {
 		void save_state (in string config_path);
 		void load_state (in string config_path);
-		oneway void notify_location_change (in NavigationInfo navinfo, 
-						    in string initial_title);
+		oneway void notify_location_change (in NavigationInfo navinfo);
 		oneway void stop_location_change ();
 		oneway void notify_selection_change (in SelectionInfo selinfo);
-		oneway void notify_title_change (in string new_title);		
 		
 		oneway void show_properties (); // Requests that the client show its properties
 	};
diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c
index 4d4c6c62e..cf2305964 100644
--- a/libnautilus/nautilus-view-frame.c
+++ b/libnautilus/nautilus-view-frame.c
@@ -37,7 +37,6 @@
 
 enum {
   NOTIFY_LOCATION_CHANGE,
-  NOTIFY_TITLE_CHANGE,
   NOTIFY_SELECTION_CHANGE,
   LOAD_STATE,
   SAVE_STATE,
@@ -77,7 +76,6 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
 static void
 impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
 					  Nautilus_NavigationInfo * navinfo,
-					  const char *initial_title,
 					  CORBA_Environment * ev);
 
 static void
@@ -90,11 +88,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
 					   CORBA_Environment * ev);
 
 static void
-impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
-				       const char * new_title,
-				       CORBA_Environment * ev);
-
-static void
 impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
 				   CORBA_Environment * ev);
 
@@ -106,7 +99,6 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_location_change,
   (gpointer) & impl_Nautilus_View_stop_location_change,
   (gpointer) & impl_Nautilus_View_notify_selection_change,
-  (gpointer) & impl_Nautilus_View_notify_title_change,
   (gpointer) & impl_Nautilus_View_show_properties
 };
 
@@ -138,10 +130,9 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
 static void
 impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
 					  Nautilus_NavigationInfo * navinfo,
-					  const char *initial_title,
 					  CORBA_Environment * ev)
 {
-  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
+  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
 }
 
 static void
@@ -160,14 +151,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
 }
 
 static void
-impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
-				       const char * new_title,
-				       CORBA_Environment * ev)
-{
-  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE], new_title);
-}
-
-static void
 impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
 					CORBA_Environment * ev)
 {
@@ -270,15 +253,13 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
   klass->servant_destroy_func = POA_Nautilus_View__fini;
   klass->vepv = &impl_Nautilus_View_vepv;
 
-  #define gtk_marshal_NONE__BOXED_POINTER gtk_marshal_NONE__POINTER_POINTER
-
   nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
     gtk_signal_new("notify_location_change",
 		   GTK_RUN_LAST,
 		   object_class->type,
 		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
-		   gtk_marshal_NONE__BOXED_POINTER,
-		   GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
+		   gtk_marshal_NONE__BOXED,
+		   GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
   nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] = 
     gtk_signal_new("notify_selection_change",
 		   GTK_RUN_LAST,
@@ -286,13 +267,6 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
 		   gtk_marshal_NONE__BOXED,
 		   GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
-  nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE] =
-    gtk_signal_new("notify_title_change",
-		   GTK_RUN_LAST,
-		   object_class->type,
-		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_title_change),
-		   gtk_marshal_NONE__POINTER,
-		   GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
   nautilus_view_frame_signals[LOAD_STATE] = 
     gtk_signal_new("load_state",
 		   GTK_RUN_LAST,
diff --git a/libnautilus/nautilus-view-frame.h b/libnautilus/nautilus-view-frame.h
index 8e91690a2..793af6897 100644
--- a/libnautilus/nautilus-view-frame.h
+++ b/libnautilus/nautilus-view-frame.h
@@ -54,13 +54,10 @@ struct _NautilusViewFrameClass
 	void (*save_state)              (NautilusViewFrame *view, const char *config_path);
 	void (*load_state)              (NautilusViewFrame *view, const char *config_path);
 	void (*notify_location_change)	(NautilusViewFrame *view,
-					 Nautilus_NavigationInfo *nav_context,
-					 const char *initial_title);
+					 Nautilus_NavigationInfo *nav_context);
 	void (*stop_location_change)    (NautilusViewFrame *view);
 	void (*notify_selection_change)	(NautilusViewFrame *view,
 					 Nautilus_SelectionInfo *nav_context);
-	void (*notify_title_change)	(NautilusViewFrame *view,
-					 const char *new_title);
 	void (*show_properties)         (NautilusViewFrame *view);
 
 	BonoboObjectClass *parent_class;
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 4d4c6c62e..cf2305964 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -37,7 +37,6 @@
 
 enum {
   NOTIFY_LOCATION_CHANGE,
-  NOTIFY_TITLE_CHANGE,
   NOTIFY_SELECTION_CHANGE,
   LOAD_STATE,
   SAVE_STATE,
@@ -77,7 +76,6 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
 static void
 impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
 					  Nautilus_NavigationInfo * navinfo,
-					  const char *initial_title,
 					  CORBA_Environment * ev);
 
 static void
@@ -90,11 +88,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
 					   CORBA_Environment * ev);
 
 static void
-impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
-				       const char * new_title,
-				       CORBA_Environment * ev);
-
-static void
 impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
 				   CORBA_Environment * ev);
 
@@ -106,7 +99,6 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_location_change,
   (gpointer) & impl_Nautilus_View_stop_location_change,
   (gpointer) & impl_Nautilus_View_notify_selection_change,
-  (gpointer) & impl_Nautilus_View_notify_title_change,
   (gpointer) & impl_Nautilus_View_show_properties
 };
 
@@ -138,10 +130,9 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
 static void
 impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
 					  Nautilus_NavigationInfo * navinfo,
-					  const char *initial_title,
 					  CORBA_Environment * ev)
 {
-  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
+  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
 }
 
 static void
@@ -160,14 +151,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
 }
 
 static void
-impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
-				       const char * new_title,
-				       CORBA_Environment * ev)
-{
-  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE], new_title);
-}
-
-static void
 impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
 					CORBA_Environment * ev)
 {
@@ -270,15 +253,13 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
   klass->servant_destroy_func = POA_Nautilus_View__fini;
   klass->vepv = &impl_Nautilus_View_vepv;
 
-  #define gtk_marshal_NONE__BOXED_POINTER gtk_marshal_NONE__POINTER_POINTER
-
   nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
     gtk_signal_new("notify_location_change",
 		   GTK_RUN_LAST,
 		   object_class->type,
 		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
-		   gtk_marshal_NONE__BOXED_POINTER,
-		   GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
+		   gtk_marshal_NONE__BOXED,
+		   GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
   nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] = 
     gtk_signal_new("notify_selection_change",
 		   GTK_RUN_LAST,
@@ -286,13 +267,6 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
 		   gtk_marshal_NONE__BOXED,
 		   GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
-  nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE] =
-    gtk_signal_new("notify_title_change",
-		   GTK_RUN_LAST,
-		   object_class->type,
-		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_title_change),
-		   gtk_marshal_NONE__POINTER,
-		   GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
   nautilus_view_frame_signals[LOAD_STATE] = 
     gtk_signal_new("load_state",
 		   GTK_RUN_LAST,
diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h
index 8e91690a2..793af6897 100644
--- a/libnautilus/nautilus-view.h
+++ b/libnautilus/nautilus-view.h
@@ -54,13 +54,10 @@ struct _NautilusViewFrameClass
 	void (*save_state)              (NautilusViewFrame *view, const char *config_path);
 	void (*load_state)              (NautilusViewFrame *view, const char *config_path);
 	void (*notify_location_change)	(NautilusViewFrame *view,
-					 Nautilus_NavigationInfo *nav_context,
-					 const char *initial_title);
+					 Nautilus_NavigationInfo *nav_context);
 	void (*stop_location_change)    (NautilusViewFrame *view);
 	void (*notify_selection_change)	(NautilusViewFrame *view,
 					 Nautilus_SelectionInfo *nav_context);
-	void (*notify_title_change)	(NautilusViewFrame *view,
-					 const char *new_title);
 	void (*show_properties)         (NautilusViewFrame *view);
 
 	BonoboObjectClass *parent_class;
diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c
index 4d4c6c62e..cf2305964 100644
--- a/libnautilus/ntl-view-frame.c
+++ b/libnautilus/ntl-view-frame.c
@@ -37,7 +37,6 @@
 
 enum {
   NOTIFY_LOCATION_CHANGE,
-  NOTIFY_TITLE_CHANGE,
   NOTIFY_SELECTION_CHANGE,
   LOAD_STATE,
   SAVE_STATE,
@@ -77,7 +76,6 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
 static void
 impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
 					  Nautilus_NavigationInfo * navinfo,
-					  const char *initial_title,
 					  CORBA_Environment * ev);
 
 static void
@@ -90,11 +88,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
 					   CORBA_Environment * ev);
 
 static void
-impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
-				       const char * new_title,
-				       CORBA_Environment * ev);
-
-static void
 impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
 				   CORBA_Environment * ev);
 
@@ -106,7 +99,6 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_location_change,
   (gpointer) & impl_Nautilus_View_stop_location_change,
   (gpointer) & impl_Nautilus_View_notify_selection_change,
-  (gpointer) & impl_Nautilus_View_notify_title_change,
   (gpointer) & impl_Nautilus_View_show_properties
 };
 
@@ -138,10 +130,9 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
 static void
 impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
 					  Nautilus_NavigationInfo * navinfo,
-					  const char *initial_title,
 					  CORBA_Environment * ev)
 {
-  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
+  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
 }
 
 static void
@@ -160,14 +151,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
 }
 
 static void
-impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
-				       const char * new_title,
-				       CORBA_Environment * ev)
-{
-  gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE], new_title);
-}
-
-static void
 impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
 					CORBA_Environment * ev)
 {
@@ -270,15 +253,13 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
   klass->servant_destroy_func = POA_Nautilus_View__fini;
   klass->vepv = &impl_Nautilus_View_vepv;
 
-  #define gtk_marshal_NONE__BOXED_POINTER gtk_marshal_NONE__POINTER_POINTER
-
   nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
     gtk_signal_new("notify_location_change",
 		   GTK_RUN_LAST,
 		   object_class->type,
 		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
-		   gtk_marshal_NONE__BOXED_POINTER,
-		   GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
+		   gtk_marshal_NONE__BOXED,
+		   GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
   nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] = 
     gtk_signal_new("notify_selection_change",
 		   GTK_RUN_LAST,
@@ -286,13 +267,6 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
 		   gtk_marshal_NONE__BOXED,
 		   GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
-  nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE] =
-    gtk_signal_new("notify_title_change",
-		   GTK_RUN_LAST,
-		   object_class->type,
-		   GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_title_change),
-		   gtk_marshal_NONE__POINTER,
-		   GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
   nautilus_view_frame_signals[LOAD_STATE] = 
     gtk_signal_new("load_state",
 		   GTK_RUN_LAST,
diff --git a/libnautilus/ntl-view-frame.h b/libnautilus/ntl-view-frame.h
index 8e91690a2..793af6897 100644
--- a/libnautilus/ntl-view-frame.h
+++ b/libnautilus/ntl-view-frame.h
@@ -54,13 +54,10 @@ struct _NautilusViewFrameClass
 	void (*save_state)              (NautilusViewFrame *view, const char *config_path);
 	void (*load_state)              (NautilusViewFrame *view, const char *config_path);
 	void (*notify_location_change)	(NautilusViewFrame *view,
-					 Nautilus_NavigationInfo *nav_context,
-					 const char *initial_title);
+					 Nautilus_NavigationInfo *nav_context);
 	void (*stop_location_change)    (NautilusViewFrame *view);
 	void (*notify_selection_change)	(NautilusViewFrame *view,
 					 Nautilus_SelectionInfo *nav_context);
-	void (*notify_title_change)	(NautilusViewFrame *view,
-					 const char *new_title);
 	void (*show_properties)         (NautilusViewFrame *view);
 
 	BonoboObjectClass *parent_class;
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 86a552e68..63e0f321c 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -131,7 +131,6 @@ static void           stop_location_change_cb
 										   FMDirectoryView         *directory_view);
 static void           notify_location_change_cb                                   (NautilusViewFrame       *view_frame,
 										   Nautilus_NavigationInfo *nav_context,
-										   const char 		   *initial_title,
 										   FMDirectoryView         *directory_view);
 static void           open_cb                                                     (GtkMenuItem             *item,
 										   GList                   *files);
@@ -642,7 +641,6 @@ fm_directory_view_send_selection_change (FMDirectoryView *view)
 static void
 notify_location_change_cb (NautilusViewFrame *view_frame,
 			   Nautilus_NavigationInfo *navigation_context,
-			   const char *initial_title,
 			   FMDirectoryView *directory_view)
 {
 	fm_directory_view_load_uri (directory_view, navigation_context->requested_uri);
diff --git a/src/nautilus-view-frame-bonobo-control.c b/src/nautilus-view-frame-bonobo-control.c
index b9f805a02..f382446e2 100644
--- a/src/nautilus-view-frame-bonobo-control.c
+++ b/src/nautilus-view-frame-bonobo-control.c
@@ -79,7 +79,7 @@ bonobo_control_get_label(NautilusView *view, CORBA_Environment *ev)
 }
 
 static void
-bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, const char *initial_title, CORBA_Environment *ev)
+bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev)
 {
   Nautilus_ProgressRequestInfo pri;
   pri.amount = 0;
@@ -98,7 +98,6 @@ NautilusViewComponentType bonobo_control_component_type = {
   &bonobo_control_notify_location_change, /* notify_location_change */
   NULL, /* stop_location_change */
   NULL, /* notify_selection_change */
-  NULL, /* notify_title_change */
   NULL, /* show_properties */
   &bonobo_control_get_label /* get_label */
 };
diff --git a/src/nautilus-view-frame-bonobo-embeddable.c b/src/nautilus-view-frame-bonobo-embeddable.c
index b5b4a44d5..57ab4c02a 100644
--- a/src/nautilus-view-frame-bonobo-embeddable.c
+++ b/src/nautilus-view-frame-bonobo-embeddable.c
@@ -43,7 +43,7 @@ destroy_bonobo_subdoc_view(NautilusView *view, CORBA_Environment *ev)
 }
 
 static void
-bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, const char *new_title, CORBA_Environment *ev)
+bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev)
 {
   Bonobo_PersistStream persist;
 
@@ -114,7 +114,6 @@ NautilusViewComponentType bonobo_subdoc_component_type = {
   &bonobo_subdoc_notify_location_change, /* notify_location_change */
   NULL, /* stop_location_change */
   NULL, /* notify_selection_change */
-  NULL, /* notify_title_change */
   NULL, /* show_properties */
   NULL, /* get_label */
 };
diff --git a/src/nautilus-view-frame-nautilus-view.c b/src/nautilus-view-frame-nautilus-view.c
index 4a48d06d1..3da81b61e 100644
--- a/src/nautilus-view-frame-nautilus-view.c
+++ b/src/nautilus-view-frame-nautilus-view.c
@@ -109,11 +109,11 @@ nv_load_state(NautilusView *view, const char *config_path, CORBA_Environment *ev
 }
 
 static void
-nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, const char *initial_title, CORBA_Environment *ev)
+nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev)
 {
   NautilusViewInfo *nvi = view->component_data;
 
-  Nautilus_View_notify_location_change(nvi->view_client, nav_ctx, initial_title, ev);
+  Nautilus_View_notify_location_change(nvi->view_client, nav_ctx, ev);
   if(ev->_major != CORBA_NO_EXCEPTION)
     gtk_object_destroy(GTK_OBJECT(view));
 }
@@ -129,16 +129,6 @@ nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx,
 }
 
 static void
-nv_notify_title_change(NautilusView *view, const char *new_title, CORBA_Environment *ev)
-{
-  NautilusViewInfo *nvi = view->component_data;
-
-  Nautilus_View_notify_title_change(nvi->view_client, new_title, ev);
-  if(ev->_major != CORBA_NO_EXCEPTION)
-    gtk_object_destroy(GTK_OBJECT(view));
-}
-
-static void
 nv_stop_location_change(NautilusView *view, CORBA_Environment *ev)
 {
   NautilusViewInfo *nvi = view->component_data;
@@ -187,7 +177,6 @@ NautilusViewComponentType nautilus_view_component_type = {
   &nv_notify_location_change, /* notify_location_change */
   &nv_stop_location_change, /*stop_location_change */
   &nv_notify_selection_change, /* notify_selection_change */
-  &nv_notify_title_change, /* notify_title_change */
   &nv_show_properties, /* show_properties */
   &nv_get_label /* get_label */
 };
diff --git a/src/nautilus-view-frame-private.h b/src/nautilus-view-frame-private.h
index 79a4b01a8..648ec9369 100644
--- a/src/nautilus-view-frame-private.h
+++ b/src/nautilus-view-frame-private.h
@@ -64,10 +64,9 @@ struct _NautilusViewComponentType {
   void (* destroy) (NautilusView *view, CORBA_Environment *ev);
   void (* save_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev);
   void (* load_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev);
-  void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, const char *initial_title, CORBA_Environment *ev);
+  void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev);
   void (* stop_location_change)(NautilusView *view, CORBA_Environment *ev);
   void (* notify_selection_change)(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev);
-  void (* notify_title_change)(NautilusView *view, const char *new_title, CORBA_Environment *ev);
   void (* show_properties)(NautilusView *view, CORBA_Environment *ev);
 
   char * (* get_label)(NautilusView *view, CORBA_Environment *ev);
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index 3cd392388..1781fedcb 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -432,8 +432,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid)
 
 void
 nautilus_view_notify_location_change(NautilusView *view,
-				     Nautilus_NavigationInfo *nav_context,
-				     const char *initial_title)
+				     Nautilus_NavigationInfo *nav_context)
 {
   Nautilus_NavigationInfo real_nav_ctx;
   CORBA_Environment ev;
@@ -454,7 +453,7 @@ nautilus_view_notify_location_change(NautilusView *view,
 
   CORBA_exception_init(&ev);
   if(view->component_class->notify_location_change)
-    view->component_class->notify_location_change(view, &real_nav_ctx, initial_title, &ev);
+    view->component_class->notify_location_change(view, &real_nav_ctx, &ev);
   CORBA_exception_free(&ev);
 }
 
@@ -477,23 +476,6 @@ nautilus_view_notify_selection_change(NautilusView *view,
 }
 
 void
-nautilus_view_notify_title_change(NautilusView *view,
-				  const char *new_title)
-{
-  CORBA_Environment ev;
-
-  g_return_if_fail(NAUTILUS_IS_VIEW(view));
-  g_return_if_fail(view->component_class);
-
-  CORBA_exception_init(&ev);
-
-  if(view->component_class->notify_title_change)
-    view->component_class->notify_title_change(view, new_title, &ev);
-
-  CORBA_exception_free(&ev);
-}
-
-void
 nautilus_view_load_state(NautilusView *view, const char *config_path)
 {
   CORBA_Environment ev;
diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h
index 090955a01..e6c6d0d47 100644
--- a/src/nautilus-view-frame.h
+++ b/src/nautilus-view-frame.h
@@ -113,12 +113,9 @@ CORBA_Object nautilus_view_get_objref           (NautilusView *view);
 /* These functions correspond to methods of the Nautilus:View CORBAinterface */
 
 void nautilus_view_notify_location_change       (NautilusView *view,
-					         Nautilus_NavigationInfo *nav_context,
-					         const char *initial_title);
+					         Nautilus_NavigationInfo *nav_context);
 void nautilus_view_notify_selection_change      (NautilusView *view,
 					         Nautilus_SelectionInfo *sel_context);
-void nautilus_view_notify_title_change		(NautilusView *view,
-						 const char *new_title);
 void nautilus_view_load_state                   (NautilusView *view, 
                                                  const char *config_path);
 void nautilus_view_save_state                   (NautilusView *view, 
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 776d25255..85c50e1d5 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -276,36 +276,11 @@ nautilus_window_request_title_change(NautilusWindow *window,
                                      const char *new_title,
                                      NautilusContentView *requesting_view)
 {
-  GSList *cur;
-
   g_return_if_fail (new_title != NULL);
 
   g_free (window->requested_title);
   window->requested_title = g_strdup (new_title);
 
-  /* 
-   * Tell the requesting content view also, to keep the code parallel. 
-   * Don't tell the view in window->content_view because it might be 
-   * the old one that's about to be removed.
-   */
-  nautilus_view_notify_title_change (NAUTILUS_VIEW (requesting_view), new_title);
-
-  for(cur = window->meta_views; cur; cur = cur->next)
-    {
-#if 0
-      /*
-       * This should tell metaviews of the new title, but
-       * something about it isn't right. If the metaview connects
-       * to the notify_title_change signal, its callback doesn't
-       * get called. And ORBit warns for each metaview about some
-       * unhandled message of type 1 (REPLY). Right now no metaviews
-       * use this anyway, but we need to fix it.
-       */
-      nautilus_view_notify_title_change (NAUTILUS_VIEW (cur->data), new_title);
-#endif
-    }
-
-  /* Now change the stuff that doesn't use the NautilusView API */
   nautilus_window_update_title_internal (window, new_title);
 }
 
@@ -470,16 +445,12 @@ nautilus_window_update_view(NautilusWindow *window,
 			    NautilusView *content_view)
 {
   CORBA_Environment environment;
-  char *current_title;
   
   g_return_if_fail(view);
   
   loci->self_originated = (view == requesting_view);
 
-  current_title = nautilus_window_get_current_location_title (window);
-  g_assert (current_title != NULL);
-  nautilus_view_notify_location_change (view, loci, current_title);
-  g_free (current_title);
+  nautilus_view_notify_location_change (view, loci);
 
   if(seli)
     {
diff --git a/src/ntl-view-bonobo-control.c b/src/ntl-view-bonobo-control.c
index b9f805a02..f382446e2 100644
--- a/src/ntl-view-bonobo-control.c
+++ b/src/ntl-view-bonobo-control.c
@@ -79,7 +79,7 @@ bonobo_control_get_label(NautilusView *view, CORBA_Environment *ev)
 }
 
 static void
-bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, const char *initial_title, CORBA_Environment *ev)
+bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev)
 {
   Nautilus_ProgressRequestInfo pri;
   pri.amount = 0;
@@ -98,7 +98,6 @@ NautilusViewComponentType bonobo_control_component_type = {
   &bonobo_control_notify_location_change, /* notify_location_change */
   NULL, /* stop_location_change */
   NULL, /* notify_selection_change */
-  NULL, /* notify_title_change */
   NULL, /* show_properties */
   &bonobo_control_get_label /* get_label */
 };
diff --git a/src/ntl-view-bonobo-subdoc.c b/src/ntl-view-bonobo-subdoc.c
index b5b4a44d5..57ab4c02a 100644
--- a/src/ntl-view-bonobo-subdoc.c
+++ b/src/ntl-view-bonobo-subdoc.c
@@ -43,7 +43,7 @@ destroy_bonobo_subdoc_view(NautilusView *view, CORBA_Environment *ev)
 }
 
 static void
-bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, const char *new_title, CORBA_Environment *ev)
+bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev)
 {
   Bonobo_PersistStream persist;
 
@@ -114,7 +114,6 @@ NautilusViewComponentType bonobo_subdoc_component_type = {
   &bonobo_subdoc_notify_location_change, /* notify_location_change */
   NULL, /* stop_location_change */
   NULL, /* notify_selection_change */
-  NULL, /* notify_title_change */
   NULL, /* show_properties */
   NULL, /* get_label */
 };
diff --git a/src/ntl-view-nautilus.c b/src/ntl-view-nautilus.c
index 4a48d06d1..3da81b61e 100644
--- a/src/ntl-view-nautilus.c
+++ b/src/ntl-view-nautilus.c
@@ -109,11 +109,11 @@ nv_load_state(NautilusView *view, const char *config_path, CORBA_Environment *ev
 }
 
 static void
-nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, const char *initial_title, CORBA_Environment *ev)
+nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev)
 {
   NautilusViewInfo *nvi = view->component_data;
 
-  Nautilus_View_notify_location_change(nvi->view_client, nav_ctx, initial_title, ev);
+  Nautilus_View_notify_location_change(nvi->view_client, nav_ctx, ev);
   if(ev->_major != CORBA_NO_EXCEPTION)
     gtk_object_destroy(GTK_OBJECT(view));
 }
@@ -129,16 +129,6 @@ nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx,
 }
 
 static void
-nv_notify_title_change(NautilusView *view, const char *new_title, CORBA_Environment *ev)
-{
-  NautilusViewInfo *nvi = view->component_data;
-
-  Nautilus_View_notify_title_change(nvi->view_client, new_title, ev);
-  if(ev->_major != CORBA_NO_EXCEPTION)
-    gtk_object_destroy(GTK_OBJECT(view));
-}
-
-static void
 nv_stop_location_change(NautilusView *view, CORBA_Environment *ev)
 {
   NautilusViewInfo *nvi = view->component_data;
@@ -187,7 +177,6 @@ NautilusViewComponentType nautilus_view_component_type = {
   &nv_notify_location_change, /* notify_location_change */
   &nv_stop_location_change, /*stop_location_change */
   &nv_notify_selection_change, /* notify_selection_change */
-  &nv_notify_title_change, /* notify_title_change */
   &nv_show_properties, /* show_properties */
   &nv_get_label /* get_label */
 };
diff --git a/src/ntl-view-private.h b/src/ntl-view-private.h
index 79a4b01a8..648ec9369 100644
--- a/src/ntl-view-private.h
+++ b/src/ntl-view-private.h
@@ -64,10 +64,9 @@ struct _NautilusViewComponentType {
   void (* destroy) (NautilusView *view, CORBA_Environment *ev);
   void (* save_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev);
   void (* load_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev);
-  void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, const char *initial_title, CORBA_Environment *ev);
+  void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev);
   void (* stop_location_change)(NautilusView *view, CORBA_Environment *ev);
   void (* notify_selection_change)(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev);
-  void (* notify_title_change)(NautilusView *view, const char *new_title, CORBA_Environment *ev);
   void (* show_properties)(NautilusView *view, CORBA_Environment *ev);
 
   char * (* get_label)(NautilusView *view, CORBA_Environment *ev);
diff --git a/src/ntl-view.c b/src/ntl-view.c
index 3cd392388..1781fedcb 100644
--- a/src/ntl-view.c
+++ b/src/ntl-view.c
@@ -432,8 +432,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid)
 
 void
 nautilus_view_notify_location_change(NautilusView *view,
-				     Nautilus_NavigationInfo *nav_context,
-				     const char *initial_title)
+				     Nautilus_NavigationInfo *nav_context)
 {
   Nautilus_NavigationInfo real_nav_ctx;
   CORBA_Environment ev;
@@ -454,7 +453,7 @@ nautilus_view_notify_location_change(NautilusView *view,
 
   CORBA_exception_init(&ev);
   if(view->component_class->notify_location_change)
-    view->component_class->notify_location_change(view, &real_nav_ctx, initial_title, &ev);
+    view->component_class->notify_location_change(view, &real_nav_ctx, &ev);
   CORBA_exception_free(&ev);
 }
 
@@ -477,23 +476,6 @@ nautilus_view_notify_selection_change(NautilusView *view,
 }
 
 void
-nautilus_view_notify_title_change(NautilusView *view,
-				  const char *new_title)
-{
-  CORBA_Environment ev;
-
-  g_return_if_fail(NAUTILUS_IS_VIEW(view));
-  g_return_if_fail(view->component_class);
-
-  CORBA_exception_init(&ev);
-
-  if(view->component_class->notify_title_change)
-    view->component_class->notify_title_change(view, new_title, &ev);
-
-  CORBA_exception_free(&ev);
-}
-
-void
 nautilus_view_load_state(NautilusView *view, const char *config_path)
 {
   CORBA_Environment ev;
diff --git a/src/ntl-view.h b/src/ntl-view.h
index 090955a01..e6c6d0d47 100644
--- a/src/ntl-view.h
+++ b/src/ntl-view.h
@@ -113,12 +113,9 @@ CORBA_Object nautilus_view_get_objref           (NautilusView *view);
 /* These functions correspond to methods of the Nautilus:View CORBAinterface */
 
 void nautilus_view_notify_location_change       (NautilusView *view,
-					         Nautilus_NavigationInfo *nav_context,
-					         const char *initial_title);
+					         Nautilus_NavigationInfo *nav_context);
 void nautilus_view_notify_selection_change      (NautilusView *view,
 					         Nautilus_SelectionInfo *sel_context);
-void nautilus_view_notify_title_change		(NautilusView *view,
-						 const char *new_title);
 void nautilus_view_load_state                   (NautilusView *view, 
                                                  const char *config_path);
 void nautilus_view_save_state                   (NautilusView *view, 
diff --git a/src/ntl-window-msgs.c b/src/ntl-window-msgs.c
index 776d25255..85c50e1d5 100644
--- a/src/ntl-window-msgs.c
+++ b/src/ntl-window-msgs.c
@@ -276,36 +276,11 @@ nautilus_window_request_title_change(NautilusWindow *window,
                                      const char *new_title,
                                      NautilusContentView *requesting_view)
 {
-  GSList *cur;
-
   g_return_if_fail (new_title != NULL);
 
   g_free (window->requested_title);
   window->requested_title = g_strdup (new_title);
 
-  /* 
-   * Tell the requesting content view also, to keep the code parallel. 
-   * Don't tell the view in window->content_view because it might be 
-   * the old one that's about to be removed.
-   */
-  nautilus_view_notify_title_change (NAUTILUS_VIEW (requesting_view), new_title);
-
-  for(cur = window->meta_views; cur; cur = cur->next)
-    {
-#if 0
-      /*
-       * This should tell metaviews of the new title, but
-       * something about it isn't right. If the metaview connects
-       * to the notify_title_change signal, its callback doesn't
-       * get called. And ORBit warns for each metaview about some
-       * unhandled message of type 1 (REPLY). Right now no metaviews
-       * use this anyway, but we need to fix it.
-       */
-      nautilus_view_notify_title_change (NAUTILUS_VIEW (cur->data), new_title);
-#endif
-    }
-
-  /* Now change the stuff that doesn't use the NautilusView API */
   nautilus_window_update_title_internal (window, new_title);
 }
 
@@ -470,16 +445,12 @@ nautilus_window_update_view(NautilusWindow *window,
 			    NautilusView *content_view)
 {
   CORBA_Environment environment;
-  char *current_title;
   
   g_return_if_fail(view);
   
   loci->self_originated = (view == requesting_view);
 
-  current_title = nautilus_window_get_current_location_title (window);
-  g_assert (current_title != NULL);
-  nautilus_view_notify_location_change (view, loci, current_title);
-  g_free (current_title);
+  nautilus_view_notify_location_change (view, loci);
 
   if(seli)
     {