aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2003-03-07 10:26:11 +0800
committerMichael Zucci <zucchi@src.gnome.org>2003-03-07 10:26:11 +0800
commit647671b6151f4e54c445ae93363a1f6136e1a88b (patch)
tree66a1a0dfe35398a05f80a512530d539168e9e626
parent414157e5440f32a8469c692822fb818c9fa92dfe (diff)
downloadgsoc2013-evolution-647671b6151f4e54c445ae93363a1f6136e1a88b.tar.gz
gsoc2013-evolution-647671b6151f4e54c445ae93363a1f6136e1a88b.tar.zst
gsoc2013-evolution-647671b6151f4e54c445ae93363a1f6136e1a88b.zip
** reverted the following patch from ettore, this is a gnome 2.2 api
2003-03-07 Not Zed <NotZed@Ximian.com> ** reverted the following patch from ettore, this is a gnome 2.2 api change, and shouldn't be used yet. * 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(). svn path=/trunk/; revision=20214
-rw-r--r--shell/ChangeLog18
-rw-r--r--shell/e-shell.c4
2 files changed, 20 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b38b6eae07..d58a31168d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,21 @@
+2003-03-07 Not Zed <NotZed@Ximian.com>
+
+ ** reverted the following patch from ettore, this is a gnome 2.2
+ api change, and shouldn't be used yet.
+
+ * 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-04 Not Zed <NotZed@Ximian.com>
+
+ * main.c (show_development_warning): Separated the current stable
+ version number from the warning prompt, and fixed a minor
+ grammatical error. For bug #38775.
+
2003-03-06 Ettore Perazzoli <ettore@ximian.com>
* e-shell.c (impl_Shell_selectUserFolder): At least for now,
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 0535821d4d..4bebc7a08f 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1151,7 +1151,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);
@@ -1321,7 +1321,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) {