Changed history list to include a separate position field instead of

	* components/history/nautilus-history-view.c:
	(history_view_update_icons), (get_history_list),
	(hyperbola_navigation_history_load_location):
	* libnautilus/nautilus-view-component.idl:
	* src/nautilus-history-frame.c:
	(impl_Nautilus_HistoryFrame_get_history_list):
	* src/nautilus-view-frame.h:
	* src/nautilus-view-frame.c:
	(nautilus_view_frame_get_history_list):
	* src/nautilus-window.c:
	(nautilus_window_get_history_list_callback),
	(nautilus_window_connect_view):
	Changed history list to include a separate position field
	instead of having a position in each entry.

	* components/notes/nautilus-notes.c: (done_with_file):
	Name changed from nautilus_file_cancel_callback to
	nautilus_file_cancel_call_when_ready to reduce confusion with
	nautilus_file_cancel.

	* libnautilus-extensions/nautilus-directory.c:
	(nautilus_directory_get): Made NULL for URI be legal (and result
	in NULL for the directory object).
	* libnautilus-extensions/nautilus-mime-actions.c:
	(get_mime_type_from_uri): Made NULL for URI be legal (and result
	in NULL for MIME type).

	* libnautilus-extensions/nautilus-entry.c:
	(nautilus_entry_set_text): Minor tweak.

	* libnautilus-extensions/nautilus-file.h:
	* libnautilus-extensions/nautilus-file-private.h:
	* libnautilus-extensions/nautilus-file.c: (operation_new),
	(operation_free), (operation_complete), (operation_cancel),
	(rename_update_info_and_metafile), (rename_callback),
	(nautilus_file_rename), (nautilus_file_cancel),
	(nautilus_file_set_owner), (nautilus_file_cancel_call_when_ready):
	Added cancelling to rename as a prelude to doing the same for
	set_file_info-based calls.

	* libnautilus-extensions/nautilus-graphic.c:
	Fixed a formatting mistake and a typo.

	* libnautilus-extensions/nautilus-stock-dialogs.h:
	* libnautilus-extensions/nautilus-stock-dialogs.c:
	(timed_wait_hash), (timed_wait_hash_equal),
	(nautilus_timed_wait_start), (nautilus_timed_wait_free),
	(nautilus_timed_wait_stop): Re-did timed wait API now that
	we are really using it. Still unimplemented.

	* src/Makefile.am:
	Since IDL dependencies are not understood by automake, added
	an explicit one so we pick up the change to the libnautilus
	view component IDL.

	* src/file-manager/fm-error-reporting.h:
	* src/file-manager/fm-error-reporting.c: (rename_callback),
	(cancel_rename_callback), (fm_rename_file): Moved code for
	renaming into here so it can be shared between the icon view
	and the properties dialog. Perhaps it needs to be renamed.

	* src/file-manager/fm-icon-view.c:
	(fm_icon_view_icon_text_changed_callback): Use the shared
	code instead of having the rename code here.

	* src/nautilus-application.c: (create_object): Make a new
	shell object each time instead of trying to share one.
	(nautilus_application_startup): Activate the shell object
	using OAF. This makes it work across processes and adds
	the feature.

	* src/nautilus-main.c: (main): Call bonobo_activate explicitly so
	CORBA calls work before the main loop.

	* src/nautilus-shell.c: (display_caveat_first_time),
	(corba_manage_desktop): Got rid of all state in NautilusShell
	so we can use multiple shell objects if we want.

	* src/nautilus-sidebar.c: (nautilus_sidebar_update_info):
	Got rid of code that checks for NULL.

1 files changed, 34 insertions, 36 deletions

diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h
index 53035d80d..3e849bb54 100644
--- a/src/nautilus-view-frame.h
+++ b/src/nautilus-view-frame.h
@@ -107,52 +107,50 @@ typedef struct {
         void (* client_gone)                (NautilusViewFrame *view);
 
 	/* Get a CORBA copy of the history list */
-	void (*get_history_list)	    (NautilusViewFrame *view,
-					     Nautilus_HistoryList **out_list);
+	Nautilus_History *
+             (* get_history_list)	    (NautilusViewFrame *view);
 
 } NautilusViewFrameClass;
 
-GtkType            	nautilus_view_frame_get_type            (void);
-NautilusViewFrame 	*nautilus_view_frame_new                (BonoboUIHandler     *ui_handler,
-                                                           	 NautilusUndoManager *undo_manager);
-gboolean           	nautilus_view_frame_load_client        	(NautilusViewFrame   *view,
-                                                           	 const char          *iid);
-const char *       	nautilus_view_frame_get_iid             (NautilusViewFrame   *view);
-CORBA_Object       	nautilus_view_frame_get_client_objref   (NautilusViewFrame   *view);
-BonoboObject *     	nautilus_view_frame_get_control_frame   (NautilusViewFrame   *view);
-CORBA_Object       	nautilus_view_frame_get_objref          (NautilusViewFrame   *view);
+GtkType            nautilus_view_frame_get_type           (void);
+NautilusViewFrame *nautilus_view_frame_new                (BonoboUIHandler     *ui_handler,
+                                                           NautilusUndoManager *undo_manager);
+gboolean           nautilus_view_frame_load_client        (NautilusViewFrame   *view,
+                                                           const char          *iid);
+const char *       nautilus_view_frame_get_iid            (NautilusViewFrame   *view);
+CORBA_Object       nautilus_view_frame_get_client_objref  (NautilusViewFrame   *view);
+BonoboObject *     nautilus_view_frame_get_control_frame  (NautilusViewFrame   *view);
+CORBA_Object       nautilus_view_frame_get_objref         (NautilusViewFrame   *view);
 
 /* These functions correspond to methods of the Nautilus:View CORBAinterface. */
-void               	nautilus_view_frame_load_location       (NautilusViewFrame   *view,
-                                                           	 const char          *location);
-void               	nautilus_view_frame_stop_loading        (NautilusViewFrame   *view);
-void               	nautilus_view_frame_selection_changed   (NautilusViewFrame   *view,
-                                                           	 GList               *selection);
+void               nautilus_view_frame_load_location      (NautilusViewFrame   *view,
+                                                           const char          *location);
+void               nautilus_view_frame_stop_loading       (NautilusViewFrame   *view);
+void               nautilus_view_frame_selection_changed  (NautilusViewFrame   *view,
+                                                           GList               *selection);
 
 /* Nautilus:Zoomable */
-gboolean           	nautilus_view_frame_is_zoomable        (NautilusViewFrame   *view);
-gdouble            	nautilus_view_frame_get_zoom_level     (NautilusViewFrame   *view);
-void               	nautilus_view_frame_set_zoom_level     (NautilusViewFrame   *view,
-                                                           	double              zoom_level);
-gdouble            	nautilus_view_frame_get_min_zoom_level (NautilusViewFrame   *view);
-gdouble            	nautilus_view_frame_get_max_zoom_level (NautilusViewFrame   *view);
-gboolean           	nautilus_view_frame_get_is_continuous  (NautilusViewFrame   *view);
+gboolean           nautilus_view_frame_is_zoomable        (NautilusViewFrame   *view);
+gdouble            nautilus_view_frame_get_zoom_level     (NautilusViewFrame   *view);
+void               nautilus_view_frame_set_zoom_level     (NautilusViewFrame   *view,
+                                                           double               zoom_level);
+gdouble            nautilus_view_frame_get_min_zoom_level (NautilusViewFrame   *view);
+gdouble            nautilus_view_frame_get_max_zoom_level (NautilusViewFrame   *view);
+gboolean           nautilus_view_frame_get_is_continuous  (NautilusViewFrame   *view);
 GList *		   	nautilus_view_frame_get_preferred_zoom_levels
-							  	(NautilusViewFrame  *view);
-
-void               	nautilus_view_frame_zoom_in            (NautilusViewFrame   *view);
-void               	nautilus_view_frame_zoom_out           (NautilusViewFrame   *view);
-void               	nautilus_view_frame_zoom_to_fit        (NautilusViewFrame   *view);
+(NautilusViewFrame  *view);
+void               nautilus_view_frame_zoom_in            (NautilusViewFrame   *view);
+void               nautilus_view_frame_zoom_out           (NautilusViewFrame   *view);
+void               nautilus_view_frame_zoom_to_fit        (NautilusViewFrame   *view);
 
 /* Other. */
-void               	nautilus_view_frame_set_active_errors  (NautilusViewFrame   *view,
-                                                           	gboolean            enabled);
-char *             	nautilus_view_frame_get_label          (NautilusViewFrame   *view);
-void               	nautilus_view_frame_set_label          (NautilusViewFrame   *view,
-                                                           	const char          *label);
-void               	nautilus_view_frame_activate           (NautilusViewFrame   *view);
-
-Nautilus_HistoryList 	*nautilus_view_frame_get_history_list	(NautilusViewFrame  *view);
+void               nautilus_view_frame_set_active_errors  (NautilusViewFrame   *view,
+                                                           gboolean             enabled);
+char *             nautilus_view_frame_get_label          (NautilusViewFrame   *view);
+void               nautilus_view_frame_set_label          (NautilusViewFrame   *view,
+                                                           const char          *label);
+void               nautilus_view_frame_activate           (NautilusViewFrame   *view);
+Nautilus_History * nautilus_view_frame_get_history_list   (NautilusViewFrame   *view);
 
 #ifdef __cplusplus
 }