diff options
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/e-local-storage.c | 4 | ||||
| -rw-r--r-- | shell/e-shell-config-autocompletion.c | 3 | ||||
| -rw-r--r-- | shell/e-shell-config-default-folders.c | 3 | ||||
| -rw-r--r-- | shell/evolution-shell-component.c | 13 |
5 files changed, 13 insertions, 15 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4470fcdf7e..d586a1a43a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,10 @@ 2002-11-05 Ettore Perazzoli <ettore@ximian.com> + * All: g_object_unref instead of bonobo_object_unref for the + EvolutionShellComponentClient and EvolutionShellClient interfaces. + +2002-11-05 Ettore Perazzoli <ettore@ximian.com> + * evolution-shell-client.c (impl_dispose): New. (impl_finalize): New. (destroy): Removed. diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 45f9ae2bc9..6cdaa1d7b3 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -321,7 +321,7 @@ component_async_create_folder_callback (EvolutionShellComponentClient *shell_com } } - bonobo_object_unref (BONOBO_OBJECT (shell_component_client)); + g_object_unref (shell_component_client); if (callback_data->listener != CORBA_OBJECT_NIL) notify_listener (callback_data->listener, storage_result, @@ -547,7 +547,7 @@ component_async_remove_folder_callback (EvolutionShellComponentClient *shell_com g_print ("...Error removing %s!\n", path); } - bonobo_object_unref (BONOBO_OBJECT (shell_component_client)); + g_object_unref (shell_component_client); /* Now go on and delete the next subfolder in the list that still exists, deallocating the elements in the list in the process. */ diff --git a/shell/e-shell-config-autocompletion.c b/shell/e-shell-config-autocompletion.c index fa993fa15d..37ea318681 100644 --- a/shell/e-shell-config-autocompletion.c +++ b/shell/e-shell-config-autocompletion.c @@ -59,8 +59,7 @@ static void config_control_destroy_callback (EvolutionConfigControl *config_control, EvolutionAutocompletionConfig *ac) { - bonobo_object_unref (BONOBO_OBJECT (ac->shell_client)); - + g_object_unref (ac->shell_client); g_object_unref (ac->config_listener); g_free (ac); diff --git a/shell/e-shell-config-default-folders.c b/shell/e-shell-config-default-folders.c index 4abeb9b5ae..0721de8e47 100644 --- a/shell/e-shell-config-default-folders.c +++ b/shell/e-shell-config-default-folders.c @@ -110,7 +110,8 @@ config_control_destroy_cb (EvolutionConfigControl *config_control, g_free (dfc->tasks_path); g_object_unref (dfc->glade); - bonobo_object_unref (BONOBO_OBJECT (dfc->shell_client)); + g_object_unref (dfc->shell_client); + g_free (dfc); } diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index 3218425e9c..8a757b0219 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -775,11 +775,8 @@ impl_finalize (GObject *object) CORBA_exception_init (&ev); if (priv->owner_client != NULL) { - BonoboObject *owner_client_object; - - owner_client_object = BONOBO_OBJECT (priv->owner_client); + g_object_unref (priv->owner_client); priv->owner_client = NULL; - bonobo_object_unref (BONOBO_OBJECT (owner_client_object)); } CORBA_exception_free (&ev); @@ -819,7 +816,6 @@ static void impl_owner_unset (EvolutionShellComponent *shell_component) { EvolutionShellComponentPrivate *priv; - BonoboObject *owner_client_object; priv = shell_component->priv; @@ -828,22 +824,19 @@ impl_owner_unset (EvolutionShellComponent *shell_component) priv->ping_timeout_id = -1; } - owner_client_object = BONOBO_OBJECT (priv->owner_client); + g_object_unref (priv->owner_client); priv->owner_client = NULL; - bonobo_object_unref (BONOBO_OBJECT (owner_client_object)); } static void impl_owner_died (EvolutionShellComponent *shell_component) { EvolutionShellComponentPrivate *priv; - BonoboObject *owner_client_object; priv = shell_component->priv; - owner_client_object = BONOBO_OBJECT (priv->owner_client); + g_object_unref (priv->owner_client); priv->owner_client = NULL; - bonobo_object_unref (BONOBO_OBJECT (owner_client_object)); /* The default implementation for ::owner_died emits ::owner_unset, so that we make the behavior for old components kind of correct without |