diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-05-31 02:36:20 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-05-31 02:36:20 +0800 |
| commit | 81864caca687b4a9ec08c61699a3608691f364ab (patch) | |
| tree | 8d4dec20d97be6d50f659641f9c0c8d7095ce3a8 | |
| parent | 02eab77be48407a37c4200489c2531d093b25c4a (diff) | |
| download | gsoc2013-evolution-81864caca687b4a9ec08c61699a3608691f364ab.tar gsoc2013-evolution-81864caca687b4a9ec08c61699a3608691f364ab.tar.gz gsoc2013-evolution-81864caca687b4a9ec08c61699a3608691f364ab.tar.bz2 gsoc2013-evolution-81864caca687b4a9ec08c61699a3608691f364ab.tar.lz gsoc2013-evolution-81864caca687b4a9ec08c61699a3608691f364ab.tar.xz gsoc2013-evolution-81864caca687b4a9ec08c61699a3608691f364ab.tar.zst gsoc2013-evolution-81864caca687b4a9ec08c61699a3608691f364ab.zip | |
Use bonobo_object_ref() instead of bonobo_object_client_ref() as the
* e-folder-list.c (e_folder_list_construct): Use
bonobo_object_ref() instead of bonobo_object_client_ref() as the
former only refs the CORBA object [Sigh].
* e-shell-config-autocompletion.c
(e_shell_config_autocompletion_create_widget): Don't unref the
shell_client here, as we need it. :-)
svn path=/trunk/; revision=17046
| -rw-r--r-- | shell/ChangeLog | 12 | ||||
| -rw-r--r-- | shell/e-folder-list.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-config-autocompletion.c | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 8cac5c663a..be113acdb1 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,17 @@ 2002-05-30 Ettore Perazzoli <ettore@ximian.com> + [This fixes #25361.] + + * e-folder-list.c (e_folder_list_construct): Use + bonobo_object_ref() instead of bonobo_object_client_ref() as the + former only refs the CORBA object [Sigh]. + + * e-shell-config-autocompletion.c + (e_shell_config_autocompletion_create_widget): Don't unref the + shell_client here, as we need it. :-) + +2002-05-30 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view-menu.c (command_about_box): Connect about_box_event_callback() to the "key_press_event" signal as well. This way the about box is closed when you press a key too. diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c index 985eed4f4c..9c53877ab2 100644 --- a/shell/e-folder-list.c +++ b/shell/e-folder-list.c @@ -556,7 +556,7 @@ GtkWidget* e_folder_list_construct (EFolderList *efl, EvolutionShellClient *client, char *xml) { efl->priv->client = client; - bonobo_object_client_ref (BONOBO_OBJECT_CLIENT (efl->priv->client), NULL); + bonobo_object_ref (BONOBO_OBJECT (efl->priv->client)); efl->priv->corba_storage_registry = evolution_shell_client_get_storage_registry_interface (client); e_folder_list_set_xml (efl, xml); return GTK_WIDGET (efl); diff --git a/shell/e-shell-config-autocompletion.c b/shell/e-shell-config-autocompletion.c index 819ab0ed7d..71e48fbdd7 100644 --- a/shell/e-shell-config-autocompletion.c +++ b/shell/e-shell-config-autocompletion.c @@ -99,9 +99,7 @@ e_shell_config_autocompletion_create_widget (EShell *shell, EvolutionConfigContr xml = bonobo_config_get_string (ac->db, "/Addressbook/Completion/uris", &ev); - ac->control_widget = e_folder_list_new (ac->shell_client, - xml); - bonobo_object_client_unref (BONOBO_OBJECT_CLIENT (ac->shell_client), NULL); + ac->control_widget = e_folder_list_new (ac->shell_client, xml); g_free (xml); gtk_object_set (GTK_OBJECT (ac->control_widget), |