From 8d5640e6ce6555768e28e207f0d165c93300cc80 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 28 Jan 2003 17:08:05 +0000 Subject: (e_shell_construct): Use bonobo_activation_server_register() instead of bonobo_activation_register_active_server() again, since we want to be able to build against bonobo-activation 2.0 and the latter is 2.2-specific. (impl_finalize): Likewise, use bonobo_activation_active_server_unregister() instead of bonobo_activation_unregister_active_server(). svn path=/trunk/; revision=19668 --- shell/e-shell.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shell/e-shell.c') diff --git a/shell/e-shell.c b/shell/e-shell.c index f78ba744af..958b1e049d 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -1149,7 +1149,7 @@ impl_finalize (GObject *object) priv = shell->priv; if (priv->iid != NULL) - bonobo_activation_unregister_active_server (priv->iid, + bonobo_activation_active_server_unregister (priv->iid, bonobo_object_corba_objref (BONOBO_OBJECT (shell))); g_free (priv->local_directory); @@ -1319,7 +1319,7 @@ e_shell_construct (EShell *shell, /* FIXME: Multi-display stuff. */ corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (shell)); - if (bonobo_activation_register_active_server (iid, corba_object, NULL) != Bonobo_ACTIVATION_REG_SUCCESS) + if (bonobo_activation_active_server_register (iid, corba_object) != Bonobo_ACTIVATION_REG_SUCCESS) return E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER; if (! show_splash) { -- cgit v1.2.3