From 9288ec2e2c8ae08e2fd27f6a55e45440156344c0 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 25 May 2001 18:35:40 +0000 Subject: Added ETSPECDIR. Added e-storage-set-view.etspec to get installed. 2001-05-21 Christopher James Lahey * Makefile.am (INCLUDES): Added ETSPECDIR. Added e-storage-set-view.etspec to get installed. * e-local-storage.c (remove_folder_directory): Commented out this function since it is unused. * e-shell-folder-commands.c (folder_selection_dialog_folder_selected_callback), e-shell-view.c (update_offline_toggle_status): Fixed warnings here by adding a return; after the g_assert_not_reached();. * e-shell-importer.c (start_import): Got rid of real_folderpath here and just reused folderpath (It was causing uninitialized variable warnings.) * e-shell.c (impl_Shell_getLocalStorage): Use bonobo_object_dup_ref here. It makes things simpler. * e-storage-set-view.c: Removed ETREE_SPEC since it's no longer needed. (convert_corba_drag_action_set_to_gdk, folder_context_menu_activate_cb, remove_cb, folder_context_menu_remove_cb): Commented out these functions since they're unused. (new_storage_cb, new_folder_cb, insert_folders, insert_storages): Don't bother using insert_id here since it no longer does anything. (new_storage_cb, removed_storage_cb, removed_folder_cb): Don't free the data returned from e_tree_memory_node_remove. (e_storage_set_view_construct): Set the destroy func here so that memory will automatically get freed when nodes are destroyed. g_strdup the root node string here. Use e_tree_construct_from_spec_file here to use an external file. (e_storage_set_view_set_show_folders): g_strdup the root node string here. * e-storage-set-view.etspec: New etspec file. * evolution-shell-component-client.c (free_ShellComponentListener_servant): Added a prototype here. svn path=/trunk/; revision=9989 --- shell/e-shell.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'shell/e-shell.c') diff --git a/shell/e-shell.c b/shell/e-shell.c index d09ceca1ad..3682373350 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -299,7 +299,6 @@ impl_Shell_getLocalStorage (PortableServer_Servant servant, { BonoboObject *bonobo_object; GNOME_Evolution_LocalStorage local_storage_interface; - GNOME_Evolution_LocalStorage copy_of_local_storage_interface; EShell *shell; EShellPrivate *priv; @@ -309,10 +308,9 @@ impl_Shell_getLocalStorage (PortableServer_Servant servant, local_storage_interface = e_local_storage_get_corba_interface (priv->local_storage); - copy_of_local_storage_interface = CORBA_Object_duplicate (local_storage_interface, ev); - Bonobo_Unknown_ref (copy_of_local_storage_interface, ev); + bonobo_object_dup_ref (local_storage_interface, ev); - return copy_of_local_storage_interface; + return local_storage_interface; } static Bonobo_Control -- cgit v1.2.3