Remove unneeded code and restore display-specific registration. This gets

	* components/hardware/main.c: (main):
	* components/image-viewer/nautilus-image-view.c:
	(init_server_factory):
	* components/loser/content/main.c: (main):
	* components/loser/sidebar/main.c: (main):
	* components/throbber/main.c: (main):
	* libnautilus/nautilus-view-standard-main.c:
	(nautilus_view_standard_main_multi),
	(nautilus_view_create_from_get_type_function):
	* src/nautilus-main.c: (main):
	Remove unneeded code and restore display-specific registration.
	This gets rid of a bunch of GNOME2_CONVERSION_COMPLETE ifdefs.

	* libnautilus-private/nautilus-directory-metafile-monitor.h:
	* libnautilus-private/nautilus-metafile-factory.c:
	* libnautilus-private/nautilus-metafile-factory.h:
	* libnautilus-private/nautilus-metafile.h:
	These had emacs mode lines that said they were IDL files.

	* libnautilus-private/nautilus-directory-metafile-monitor.c:
	* libnautilus-private/nautilus-metafile-factory.c:
	* libnautilus-private/nautilus-metafile.c:
	* libnautilus-private/nautilus-undo-context.c:
	* libnautilus-private/nautilus-undo-manager.c:
	* libnautilus/nautilus-undo-transaction.c:
	* src/nautilus-application.c:
	* src/nautilus-shell.c:
	* src/nautilus-view-frame-corba.c:
	Use BONOBO_CLASS_BOILERPLATE_FULL instead of EEL_BONOBO_BOILERPLATE_FULL.

	* src/nautilus-sidebar-title.c: (measure_width_callback),
	(update_more_info): First cut at implementing date that fits into
	sidebar. Not working yet.

	* src/nautilus-theme-selector.c:
	(install_theme_button_clicked_callback):
	Remove eel_gtk_window_set_up_close_accelerator call, since this is a
	GtkDialog that comes its own close accelerator.

2 files changed, 8 insertions, 26 deletions

diff --git a/libnautilus/nautilus-undo-transaction.c b/libnautilus/nautilus-undo-transaction.c
index ec89eb4a6..b100612ec 100644
--- a/libnautilus/nautilus-undo-transaction.c
+++ b/libnautilus/nautilus-undo-transaction.c
@@ -34,18 +34,15 @@
 
 #define NAUTILUS_UNDO_TRANSACTION_LIST_DATA "Nautilus undo transaction list"
 
-static void nautilus_undo_transaction_class_init (NautilusUndoTransactionClass *class);
-static void nautilus_undo_transaction_init       (NautilusUndoTransaction      *item);
 static void nautilus_undo_transaction_undo       (NautilusUndoTransaction      *transaction);
 
 /* undo atoms */
 static void undo_atom_list_free                  (GList                        *list);
 static void undo_atom_list_undo_and_free         (GList                        *list);
 
-EEL_BONOBO_BOILERPLATE_FULL (NautilusUndoTransaction,
-			     Nautilus_Undo_Transaction,
-			     nautilus_undo_transaction,
-			     BONOBO_OBJECT_TYPE)
+BONOBO_CLASS_BOILERPLATE_FULL (NautilusUndoTransaction, nautilus_undo_transaction,
+			       Nautilus_Undo_Transaction,
+			       BonoboObject, BONOBO_OBJECT_TYPE)
 
 static Nautilus_Undo_MenuItem *
 impl_Nautilus_Undo_Transaction__get_undo_menu_item (PortableServer_Servant servant,
@@ -120,11 +117,10 @@ nautilus_undo_transaction_new (const char *operation_name,
 }
 
 static void 
-nautilus_undo_transaction_init (NautilusUndoTransaction *transaction)
+nautilus_undo_transaction_instance_init (NautilusUndoTransaction *transaction)
 {
 }
 
-
 static void
 remove_transaction_from_object (gpointer list_data, gpointer callback_data)
 {
diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c
index 27282bbc4..371e2d432 100644
--- a/libnautilus/nautilus-view-standard-main.c
+++ b/libnautilus/nautilus-view-standard-main.c
@@ -163,9 +163,7 @@ nautilus_view_standard_main_multi (const char *executable_name,
 {
 	BonoboGenericFactory *factory;
 	CallbackData callback_data;
-#ifdef GNOME2_CONVERSION_COMPLETE
 	char *registration_id;
-#endif
 
 	g_return_val_if_fail (executable_name != NULL, EXIT_FAILURE);
 	g_return_val_if_fail (version != NULL, EXIT_FAILURE);
@@ -198,9 +196,6 @@ nautilus_view_standard_main_multi (const char *executable_name,
 	gnome_client_disable_master_connection ();
 #endif
 
-#if GNOME2_CONVERSION_COMPLETE
-	gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
-#endif
 	/* Initialize libraries. */
 	g_thread_init (NULL);
 	gnome_vfs_init ();
@@ -219,30 +214,22 @@ nautilus_view_standard_main_multi (const char *executable_name,
 	callback_data.delayed_quit_timeout_id = 0;
 
 	/* Create the factory. */
-
-#ifdef GNOME2_CONVERSION_COMPLETE
-        registration_id = bonobo_activation_make_registration_id (factory_iid, 
-						    DisplayString (GDK_DISPLAY ()));
-#endif
-
-	factory = bonobo_generic_factory_new (factory_iid, 
+        registration_id = bonobo_activation_make_registration_id (factory_iid, DisplayString (gdk_display));
+	factory = bonobo_generic_factory_new (registration_id, 
 					      make_object,
 					      &callback_data);
-#ifdef GNOME2_CONVERSION_COMPLETE
 	g_free (registration_id);
-#endif
 
 	if (factory != NULL) {
 		/* Loop until we have no more objects. */
 		do {
-			bonobo_main ();
+			gtk_main ();
 		} while (callback_data.object_count > 0 || callback_data.delayed_quit_timeout_id != 0);
-		
-		/* Let the factory go. */
 		bonobo_object_unref (BONOBO_OBJECT (factory));
 	}
 
 	gnome_vfs_shutdown ();
+	bonobo_ui_debug_shutdown ();
 
 	return EXIT_SUCCESS;
 }
@@ -330,4 +317,3 @@ nautilus_view_create_from_get_type_function (const char *iid, void *user_data)
 {
 	return NAUTILUS_VIEW (g_object_new (((TypeFunc) (user_data)) (), NULL));
 }
-