diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-03-07 01:22:10 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-03-07 01:22:10 +0800 |
| commit | 6681286707f0a054eaee45cc81560dcc8be4de3c (patch) | |
| tree | bffafe0e7a27895689999156ef329fcf47606649 | |
| parent | f451e0990a05218bf32821701a8f58e40566aebf (diff) | |
| download | gsoc2013-evolution-6681286707f0a054eaee45cc81560dcc8be4de3c.tar gsoc2013-evolution-6681286707f0a054eaee45cc81560dcc8be4de3c.tar.gz gsoc2013-evolution-6681286707f0a054eaee45cc81560dcc8be4de3c.tar.bz2 gsoc2013-evolution-6681286707f0a054eaee45cc81560dcc8be4de3c.tar.lz gsoc2013-evolution-6681286707f0a054eaee45cc81560dcc8be4de3c.tar.xz gsoc2013-evolution-6681286707f0a054eaee45cc81560dcc8be4de3c.tar.zst gsoc2013-evolution-6681286707f0a054eaee45cc81560dcc8be4de3c.zip | |
(impl_finalize): Use
bonobo_activation_unregister_active_server() instead of
bonobo_activatino_active_server_unregister().
(e_shell_construct): Use
bonobo_activation_register_active_server() instead of
bonobo_activation_active_server_register().
svn path=/trunk/; revision=20198
| -rw-r--r-- | shell/ChangeLog | 9 | ||||
| -rw-r--r-- | shell/e-shell.c | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 188f6168ff..6983fc6084 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,14 @@ 2003-03-06 Ettore Perazzoli <ettore@ximian.com> + * e-shell.c (impl_finalize): Use + bonobo_activation_unregister_active_server() instead of + bonobo_activatino_active_server_unregister(). + (e_shell_construct): Use + bonobo_activation_register_active_server() instead of + bonobo_activation_active_server_register(). + +2003-03-06 Ettore Perazzoli <ettore@ximian.com> + * e-shell-importer.c (IN): Use G_GNUC_FUNCTION instead of __FUNCTION__. (OUT): Likewise. diff --git a/shell/e-shell.c b/shell/e-shell.c index 71516af329..a542dda597 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_active_server_unregister (priv->iid, + bonobo_activation_unregister_active_server (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_active_server_register (iid, corba_object) != Bonobo_ACTIVATION_REG_SUCCESS) + if (bonobo_activation_register_active_server (iid, corba_object, NULL) != Bonobo_ACTIVATION_REG_SUCCESS) return E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER; if (! show_splash) { |