My apologies to all who read the cvs commits list that have

	suffered from my "spam" in the past (due to my use of emacs cvs
	mode to commit).  I will never use emacs cvs mode again so you
	will see each of my commits only once!

	* src/file-manager/fm-error-reporting.c:
	(rename_callback_data_free), (rename_callback),
	(cancel_rename_callback), (fm_rename_file):
	Finished the 1/2 done code for renaming.

	* src/nautilus-main.c: (main): Removed the call to bonobo_shutdown
	since Michael decided he won't do it this way any more.

	* src/nautilus-window.c: (nautilus_window_destroy): Added code
	to unref the UI handler to fix a leak.

	* components/hardware/nautilus-hardware-view.h:
	* components/loser/content/nautilus-content-loser.h:
	* components/loser/sidebar/nautilus-sidebar-loser.h:
	* components/mozilla/nautilus-mozilla-content-view.h:
	* components/music/nautilus-music-view.h:
	* components/rpmview/nautilus-rpm-view.h:
	* components/services/install/lib/eazel-install-corba-callback.h:
	* components/services/install/lib/eazel-install-public.h:
	* components/services/install/nautilus-view/nautilus-service-install-view.h:
	* components/services/inventory/nautilus-view/nautilus-inventory-view.h:
	* components/services/login/nautilus-view/nautilus-login-view.h:
	* components/services/startup/nautilus-view/nautilus-service-startup-view.h:
	* components/services/summary/nautilus-view/nautilus-summary-view.h:
	* components/services/time/nautilus-view/trilobite-eazel-time-view.h:
	* components/services/time/service/trilobite-eazel-time-service-public.h:
	* components/services/trilobite/libtrilobite/trilobite-root-helper.h:
	* components/services/trilobite/libtrilobite/trilobite-service-passwordquery-public.h:
	* components/services/trilobite/libtrilobite/trilobite-service-public.h:
	* components/services/trilobite/sample/lib/sample-service-public.h:
	* components/tree/nautilus-tree-view.h:
	* libnautilus/nautilus-view.h:
	* libnautilus/nautilus-zoomable.h:
	* src/file-manager/fm-desktop-icon-view.h:
	* src/file-manager/fm-directory-view.h:
	* src/file-manager/fm-icon-view.h:
	* src/file-manager/fm-list-view.h:
	* src/nautilus-application.h:
	* src/nautilus-shell.h:
	* src/nautilus-view-frame.h:
	Fixed a copied and pasted typo.

1 files changed, 1 insertions, 12 deletions

diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index a12e3e985..46ce8d127 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -25,18 +25,13 @@
 #include <bonobo/bonobo-object.h>
 #include <libnautilus-extensions/nautilus-undo-manager.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
 #define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:nautilus_file_manager_desktop_icon_view:8d8121b1-0f1e-400b-bf0d-5b0f4555f5e1"
 
 #define NAUTILUS_TYPE_APPLICATION	     (nautilus_application_get_type ())
 #define NAUTILUS_APPLICATION(obj)	     (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_APPLICATION, NautilusApplication))
 #define NAUTILUS_APPLICATION_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_APPLICATION, NautilusApplicationClass))
 #define NAUTILUS_IS_APPLICATION(obj)	     (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_APPLICATION))
-#define NAUTILUS_IS_APPLICATION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_APPLICATION))
+#define NAUTILUS_IS_APPLICATION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_APPLICATION))
 
 #ifndef NAUTILUS_WINDOW_DEFINED
 #define NAUTILUS_WINDOW_DEFINED
@@ -52,8 +47,6 @@ typedef struct {
 
 typedef struct {
 	BonoboObjectClass parent_class;
-	gpointer servant;
-	gpointer unknown_epv;
 } NautilusApplicationClass;
 
 GtkType              nautilus_application_get_type      (void);
@@ -64,8 +57,4 @@ gboolean             nautilus_application_startup       (NautilusApplication *ap
 NautilusWindow *     nautilus_application_create_window (NautilusApplication *application);
 void                 nautilus_application_quit          (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* NAUTILUS_APPLICATION_H */