New. (impl_finalize): New. (destroy): Removed. (class_init): Install

* evolution-shell-client.c (impl_dispose): New.
(impl_finalize): New.
(destroy): Removed.
(class_init): Install dispose, finalize handlers.

* All: Use evolution_shell_client_corba_objref() or
evolution_shell_component_client_corba_objref() instead of
BONOBO_OBJREF() or bonobo_object_corba_objref() where needed.

* e-folder-type-registry.c (set_handler): Use g_object_ref() for
the handler, not bonobo_object_ref().
(folder_type_free): Likewise for unref.

* evolution-shell-component-client.c
(evolution_shell_component_client_corba_objref): New.
(impl_dispose): Moved from impl_destroy; only unref things.
(impl_finalize) New.
(class_init): Install dispose/finalize.
(evolution_shell_component_client_get_dnd_source_interface): Use
priv->corba_objref instead of bonobo_object_corba_objref() since
we are not a BonoboObject anymore.
(evolution_shell_component_client_get_dnd_destination_interface):
Likewise.
(evolution_shell_component_client_get_offline_interface): Likewise.
(evolution_shell_component_client_set_owner): Likewise.
(evolution_shell_component_client_unset_owner): Likewise.
(evolution_shell_component_client_create_view): Likewise.
(evolution_shell_component_client_handle_external_uri): Likewise.
(evolution_shell_component_client_async_create_folder): Likewise.
(evolution_shell_component_client_async_xfer_folder): Likewise.
(evolution_shell_component_client_populate_folder_context_menu): Likewise.
(evolution_shell_component_client_unpopulate_folder_context_menu): Likewise.

* e-component-registry.c (register_component): Use
evolution_shell_component_client_corba_objref().
(e_component_registry_restart_component): Likewise.
(component_free): Likewise.

* evolution-shell-component-client.c: g_object_new() instead of gtk_type_new().
* e-component-registry.c: Likewise.
* e-corba-config-page.c
* e-folder-list.c: Likewise.
* e-folder-type-registry.c: Likewise.
* e-folder.c: Likewise.
* e-gray-bar.c: Likewise.
* e-history.c: Likewise.
* e-local-folder.c: Likewise.
* e-local-folder.c: Likewise.
* e-local-storage.c: Likewise.
* e-shell-about-box.c: Likewise.
* e-shell-config-default-folders.c: Likewise.
* e-shell-folder-selection-dialog.c: Likewise.
* e-shell-folder-title-bar.c: Likewise.
* e-shell-offline-handler.c: Likewise.
* e-shell-settings-dialog.c: Likewise.
* e-shell-user-creatable-items-handler.c: Likewise.
* e-shell-view.c: Likewise.
* e-shortcuts-view-model.c: Likewise.
* e-shortcuts-view.c: Likewise.
* e-shortcuts.c: Likewise.
* e-splash.c: Likewise.
* e-storage-set-view.c: Likewise.
* e-storage-set.c: Likewise.
* e-storage.c: Likewise.
* e-task-bar.c: Likewise.
* e-task-widget.c: Likewise.
* e-uri-schema-registry.c: Likewise.
* evolution-activity-client.c: Likewise.
* evolution-folder-selector-button.c: Likewise.
* evolution-shell-client.c: Likewise.
* evolution-shell-view.c: Likewise.
* evolution-storage-listener.c: Likewise.
* evolution-storage-set-view-listener.c: Likewise.
* evolution-storage-set-view.c: Likewise.
* evolution-wizard.c: Likewise.

* GNOME_Evolution_TestComponent.server: Renamed from
GNOME_Evolution_TestComponent.oaf.

* evolution-test-component.c (spit_out_shortcuts): Use
BONOBO_EX_REPOID().
(create_new_folder_selector): Ported to use GtkDialog instead of
GnomeDialog.
(storage_cancel_discover_shared_folder_callback): Add missing
G_OBJECT() cast.
(shared_folder_discovery_timeout_callback): Likewise.
(storage_discover_shared_folder_callback): Likewise.
(timeout_callback_2): Likewise.
(timeout_callback_1): Likewise.
(shared_folder_discovery_timeout_callback): Use
g_object_get_data() instead of gtk_object_get_data().
(storage_cancel_discover_shared_folder_callback): Likewise.
(timeout_callback_2): Likewise.
(timeout_callback_2): g_timeout_add() instead of
gtk_timeout_add().
(create_view_fn): Likewise.
(timeout_callback_1): Likewise.
(timeout_callback_1): Pass NULL as the error arg to
gdk_pixbuf_new_from_file().
(register_component): Use bonobo-activation instead of OAF.

* e-shell-about-box.c (impl_destroy): Removed.
(impl_finalize): New.
(class_init): Install finalize handler, not destroy.

* e-shell-about-box.c (e_shell_about_box_construct): Removed.

svn path=/trunk/; revision=18554

1 files changed, 6 insertions, 6 deletions

diff --git a/shell/e-shell.c b/shell/e-shell.c
index 5556e585f3..bf55bf0da7 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -205,7 +205,7 @@ set_interactive (EShell *shell,
 
 		id = (const char *) p->data;
 		shell_component_client = e_component_registry_get_component_by_id (priv->component_registry, id);
-		shell_component_objref = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client));
+		shell_component_objref = evolution_shell_component_client_corba_objref (shell_component_client);
 
 		CORBA_exception_init (&ev);
 
@@ -356,7 +356,7 @@ impl_Shell_getComponentByType (PortableServer_Servant servant,
 		return CORBA_OBJECT_NIL;
 	}
 
-	corba_component = bonobo_object_corba_objref (BONOBO_OBJECT (handler));
+	corba_component = evolution_shell_component_client_corba_objref (handler);
 	Bonobo_Unknown_ref (corba_component, ev);
 
 	return CORBA_Object_duplicate (corba_component, ev);
@@ -870,7 +870,7 @@ set_owner_on_components (EShell *shell,
 	priv = shell->priv;
 	local_directory = e_shell_get_local_directory (shell);
 
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
+	corba_shell = BONOBO_OBJREF (shell);
 
 	id_list = e_component_registry_get_id_list (priv->component_registry);
 	for (p = id_list; p != NULL; p = p->next) {
@@ -1623,7 +1623,7 @@ save_settings_for_component (EShell *shell,
 	char *prefix;
 	gboolean retval;
 
-	unknown_interface = bonobo_object_corba_objref (BONOBO_OBJECT (client));
+	unknown_interface = evolution_shell_component_client_corba_objref (client);
 	g_assert (unknown_interface != CORBA_OBJECT_NIL);
 
 	CORBA_exception_init (&ev);
@@ -1832,7 +1832,7 @@ e_shell_component_maybe_crashed   (EShell *shell,
 
 	component = e_folder_type_registry_get_handler_for_type (priv->folder_type_registry, type_name);
 	if (component != NULL
-	    && bonobo_unknown_ping (bonobo_object_corba_objref (BONOBO_OBJECT (component)), NULL))
+	    && bonobo_unknown_ping (evolution_shell_component_client_corba_objref (component), NULL))
 		return;
 
 	/* See if that type has caused a crash already.  */
@@ -2038,7 +2038,7 @@ e_shell_send_receive (EShell *shell)
 		CORBA_exception_init (&ev);
 
 		GNOME_Evolution_ShellComponent_sendReceive
-			(bonobo_object_corba_objref (BONOBO_OBJECT (component_client)), TRUE, &ev);
+			(evolution_shell_component_client_corba_objref (component_client), TRUE, &ev);
 
 		if (BONOBO_EX (&ev))
 			g_warning ("Error invoking Send/Receive on %s -- %s", id, BONOBO_EX_REPOID (&ev));