Moved to make clear that popt must build first.

	* HACKING: Moved to make clear that popt must build first.

	* RENAMING: Added some new file renamings.

	* src/nautilus-zoomable-frame-svr.c:
	* src/nautilus.h: [removed]
	* src/ntl-app.c:
	* src/ntl-main.c:
	* src/ntl-meta-view.c:
	* src/ntl-types.h: [removed]
	* src/ntl-uri-map.c:
	* src/ntl-view-bonobo-control.c:
	* src/ntl-view-bonobo-subdoc.c:
	* src/ntl-view-frame-svr.c:
	* src/ntl-view-nautilus.c:
	* src/ntl-view-private.h:
	* src/ntl-view.c:
	* src/ntl-window-msgs.c:
	* src/ntl-window-state.c:
	* src/ntl-window.c:
	Got rid of "nautilus.h" and "ntl-types.h".

	* libnautilus/nautilus-undo-context.c:
	(impl_Nautilus_Undo_Context__destroy),
	(impl_Nautilus_Undo_Context__create),
	(impl_Nautilus_Undo_Context__get_undo_manager),
	(nautilus_undo_context_new), (nautilus_undo_context_initialize),
	(destroy):
	* libnautilus/nautilus-undo-manager.c:
	(impl_Nautilus_Undo_Manager__destroy),
	(impl_Nautilus_Undo_Manager__create),
	(impl_Nautilus_Undo_Manager__append),
	(impl_Nautilus_Undo_Manager__forget),
	(impl_Nautilus_Undo_Manager__undo), (nautilus_undo_manager_new),
	(nautilus_undo_manager_initialize),
	(nautilus_undo_manager_initialize_class),
	(nautilus_undo_manager_undo), (nautilus_undo_manager_redo),
	(nautilus_undo_manager_add_transaction),
	(nautilus_undo_manager_unregister_object),
	(nautilus_undo_manager_can_undo), (nautilus_undo_manager_can_redo),
	(destroy), (nautilus_undo_manager_enable_redo),
	(nautilus_undo_manager_set_queue_depth), (free_undo_manager_list):
	Various code cleanups. Specifically, get rid of unused
	bonobo_object and rename gtk_object to bonobo_object.
	Get rid of some yucky function pointer casts.

	* src/ntl-app.c: (nautilus_app_init):
	Got rid of bogus extra ref.

	* libnautilus-extensions/nautilus-program-chooser.c:
	(nautilus_program_chooser_new): Reindent part just to annoy John.
	* libnautilus-extensions/nautilus-program-choosing.c:
	(nautilus_launch_application): Newline at end of file (ugh).

	* src/ntl-index-panel.c: (add_command_buttons): Format tweaking.

1 files changed, 40 insertions, 31 deletions

diff --git a/RENAMING b/RENAMING
index 70b39403c..e7bbf9a7e 100644
--- a/RENAMING
+++ b/RENAMING
@@ -1,58 +1,67 @@
-We put plans for renaming in here so we can think about them for a while.
-Note that when we rename a class, it usually involves renaming some files too.
----
+We put plans for renaming in here so we can think about them for a
+while.  Note that when we rename a class, it usually involves renaming
+some functions and files too.
 
+----------
+file names
+----------
+components/history/ntl-history-view.c -> components/history/nautilus-history-view.c
+components/notes/ntl-notes.c -> components/notes/nautilus-notes.c
+libnautilus/nautilus-content-view-frame.c -> libnautilus/nautilus-content-view.c
+libnautilus/nautilus-content-view-frame.h -> libnautilus/nautilus-content-view.h
+libnautilus/nautilus-meta-view-frame.c -> libnautilus/nautilus-meta-view.c
+libnautilus/nautilus-meta-view-frame.h -> libnautilus/nautilus-meta-view.h
+libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c
+libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h
+src/nautilus-index-tabs.c -> src/nautilus-sidebar-tabs.c
+src/nautilus-index-tabs.h -> src/nautilus-sidebar-tabs.h
+src/nautilus-index-title.c -> src/nautilus-sidebar-title.c
+src/nautilus-index-title.h -> src/nautilus-sidebar-title.h
+src/nautilus-zoomable-frame-svr.c -> src/nautilus-zoomable-frame-corba.c
 src/ntl-app.c -> src/nautilus-application.c
 src/ntl-app.h -> src/nautilus-application.h
 src/ntl-content-view.c -> src/nautilus-content-view-frame.c
 src/ntl-content-view.h -> src/nautilus-content-view-frame.h
+src/ntl-index-panel.c -> src/nautilus-sidebar.c
+src/ntl-index-panel.h -> src/nautilus-sidebar.h
 src/ntl-main.c -> src/nautilus-main.c
 src/ntl-meta-view.c -> src/nautilus-meta-view-frame.c
 src/ntl-meta-view.h -> src/nautilus-meta-view-frame.h
+src/ntl-miniicon.c -> libnautilus-extensions/nautilus-mini-icon.c
+src/ntl-miniicon.h -> libnautilus-extensions/nautilus-mini-icon.h
+src/ntl-uri-map.c -> src/nautilus-applicable-views.c
+src/ntl-uri-map.h -> src/nautilus-applicable-views.h
 src/ntl-view-bonobo-control.c -> src/nautilus-view-frame-bonobo-control.c
 src/ntl-view-bonobo-subdoc.c -> src/nautilus-view-frame-bonobo-embeddable.c
+src/ntl-view-frame-svr.c -> src/nautilus-view-frame-corba.c
+src/ntl-view-nautilus.c -> src/nautilus-view-frame-nautilus-view.c
 src/ntl-view-private.h -> src/nautilus-view-frame-private.h
 src/ntl-view.c -> src/nautilus-view-frame.c
 src/ntl-view.h -> src/nautilus-view-frame.h
+src/ntl-window-msgs.c -> src/nautilus-window-manage-views.c
+src/ntl-window-msgs.h -> src/nautilus-window-manage-views.h
 src/ntl-window-private.h -> src/nautilus-window-private.h
 src/ntl-window-state.c -> src/nautilus-window-state.c
 src/ntl-window-state.h -> src/nautilus-window-state.h
 src/ntl-window.c -> src/nautilus-window.c
 src/ntl-window.h -> src/nautilus-window.h
-libnautilus/nautilus-content-view-frame.c -> libnautilus/nautilus-content-view.c
-libnautilus/nautilus-content-view-frame.h -> libnautilus/nautilus-content-view.h
-libnautilus/nautilus-meta-view-frame.c -> libnautilus/nautilus-meta-view.c
-libnautilus/nautilus-meta-view-frame.h -> libnautilus/nautilus-meta-view.h
-libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c
-libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h
-src/ntl-view-nautilus.c -> src/nautilus-view-frame-nautilus-view.c
-src/ntl-index-panel.c -> nautilus-sidebar.c
-src/ntl-index-panel.h -> nautilus-sidebar.h
-src/ntl-miniicon.c -> libnautilus-extensions/nautilus-mini-icon.c
-src/ntl-miniicon.h -> libnautilus-extensions/nautilus-mini-icon.h
-
-src/ntl-types.h -> (delete this file)
-
 
-src/ntl-uri-map.c -> nautilus-applicable-views.c
-src/ntl-uri-map.h -> nautilus-applicable-views.h
-src/ntl-window-msgs.c -> nautilus-window-manage-views.c
-src/ntl-window-msgs.h -> nautilus-window-manage-views.h
-
-ntl* -> nautilus*
-
-GtkScrollFrame -> NautilusScrollFrame
-
-*_cb -> *_callback
+components/html/ntl-web-browser.c -> ?
+components/websearch/ntl-web-search.c -> ?
 
+----------------------------
+classes and other data types
+----------------------------
 *IndexPanel* -> *Sidebar*
 *MetaView* -> *SidebarPanel*
-
-
+GtkScrollFrame -> NautilusScrollFrame
 NavigationRequestInfo -> NavigationRequest
 NavigationInfo -> Location
-	
 SelectionInfo -> Selection
 SelectionRequestInfo -> SelectionRequest
-
 StatusRequestInfo -> Status (or StatusRequest)
+
+--------------
+function names
+--------------
+*_cb -> *_callback