diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-29 01:08:05 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-29 01:08:05 +0800 |
| commit | 8d5640e6ce6555768e28e207f0d165c93300cc80 (patch) | |
| tree | cf798d660ead9dc5d85afd4ee13b56efefaf906d | |
| parent | 00c804a57279e77b063e48f7658e678e99538460 (diff) | |
| download | gsoc2013-evolution-8d5640e6ce6555768e28e207f0d165c93300cc80.tar gsoc2013-evolution-8d5640e6ce6555768e28e207f0d165c93300cc80.tar.gz gsoc2013-evolution-8d5640e6ce6555768e28e207f0d165c93300cc80.tar.bz2 gsoc2013-evolution-8d5640e6ce6555768e28e207f0d165c93300cc80.tar.lz gsoc2013-evolution-8d5640e6ce6555768e28e207f0d165c93300cc80.tar.xz gsoc2013-evolution-8d5640e6ce6555768e28e207f0d165c93300cc80.tar.zst gsoc2013-evolution-8d5640e6ce6555768e28e207f0d165c93300cc80.zip | |
(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
| -rw-r--r-- | shell/ChangeLog | 11 | ||||
| -rw-r--r-- | shell/e-shell.c | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index da1f129789..644423621e 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,14 @@ +2003-01-28 Ettore Perazzoli <ettore@ximian.com> + + * e-shell.c (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(). + 2003-01-27 Ettore Perazzoli <ettore@ximian.com> * e-shell-importer.c (choose_importer_from_list): Set 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) { |