diff options
| author | Dan Winship <danw@src.gnome.org> | 2002-10-01 02:41:05 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2002-10-01 02:41:05 +0800 |
| commit | 45fd1767502d711d72087cae76c3d1acd7f46066 (patch) | |
| tree | 78efae6fd605a5e867fe7b0f24ae8fb9dbce9443 /shell/e-shell-view-menu.c | |
| parent | b887e5c2f6fdb8e7437093c3bc49fd439155e346 (diff) | |
| download | gsoc2013-evolution-45fd1767502d711d72087cae76c3d1acd7f46066.tar gsoc2013-evolution-45fd1767502d711d72087cae76c3d1acd7f46066.tar.gz gsoc2013-evolution-45fd1767502d711d72087cae76c3d1acd7f46066.tar.bz2 gsoc2013-evolution-45fd1767502d711d72087cae76c3d1acd7f46066.tar.lz gsoc2013-evolution-45fd1767502d711d72087cae76c3d1acd7f46066.tar.xz gsoc2013-evolution-45fd1767502d711d72087cae76c3d1acd7f46066.tar.zst gsoc2013-evolution-45fd1767502d711d72087cae76c3d1acd7f46066.zip | |
Calls e_shell_command_remove_shared_folder. (file_verbs): Set up
* e-shell-view-menu.c (command_remove_other_users_folder): Calls
e_shell_command_remove_shared_folder.
(file_verbs): Set up command_remove_other_users_folder.
* e-shell-folder-commands.c
(e_shell_command_remove_shared_folder): New. Calls
e_storage_set_async_remove_shared_folder with a callback to pop up
an error dialog if it fails.
* e-storage-set.c (e_storage_set_async_remove_shared_folder):
Implement. Mostly like async_remove_folder.
* e-storage.c (e_storage_supports_shared_folders,
e_storage_async_discover_shared_folder,
e_storage_async_remove_shared_folder): New methods. Default
implementations return FALSE, NOTIMPLEMENTED, and NOTIMPLEMENTED.
* e-corba-storage.c (supports_shared_folders,
async_discover_shared_folder, async_remove_shared_folder):
Implement using CORBA.
* Evolution-Storage.idl: add Storage_asyncRemoveSharedFolder
* e-shell-shared-folder-picker-dialog.c: Remove all the CORBA
stuff from here and use the new EStorage methods.
(setup_server_option_menu): Use e_storage_supports_shared_folders.
(discover_folder): Use e_storage_async_discover_shared_folder.
* evolution-storage.c (impl_Storage_asyncRemoveSharedFolder):
Implement this by emitting a REMOVE_SHARED_FOLDER signal.
(impl_Storage_asyncDiscoverSharedFolder): Make the
DISCOVER_SHARED_FOLDER signal put the Bonobo_Listener first like
all the other signals do.
(class_init): Set up REMOVE_SHARED_FOLDER signal.
svn path=/trunk/; revision=18265
Diffstat (limited to 'shell/e-shell-view-menu.c')
| -rw-r--r-- | shell/e-shell-view-menu.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index c8ee62123c..253c8f6169 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -429,7 +429,7 @@ command_add_folder_to_shortcut_bar (BonoboUIComponent *uih, } -/* Opening other users' folders. */ +/* Opening and removing other users' folders. */ static void command_open_other_users_folder (BonoboUIComponent *uih, @@ -445,6 +445,18 @@ command_open_other_users_folder (BonoboUIComponent *uih, e_shell_show_shared_folder_picker_dialog (shell, shell_view); } +static void +command_remove_other_users_folder (BonoboUIComponent *uih, + void *data, + const char *path) +{ + EShellView *shell_view; + + shell_view = E_SHELL_VIEW (data); + e_shell_command_remove_shared_folder (e_shell_view_get_shell (shell_view), shell_view, + get_path_for_folder_op (shell_view)); +} + /* Going to a folder. */ @@ -667,6 +679,7 @@ static BonoboUIVerb new_verbs [] = { static BonoboUIVerb file_verbs [] = { BONOBO_UI_VERB ("FileImporter", (BonoboUIVerbFn) show_import_wizard), BONOBO_UI_VERB ("FileOpenOtherUsersFolder", command_open_other_users_folder), + BONOBO_UI_VERB ("FileRemoveOtherUsersFolder", command_remove_other_users_folder), BONOBO_UI_VERB ("FileGoToFolder", command_goto_folder), BONOBO_UI_VERB ("FileCreateFolder", command_create_folder), BONOBO_UI_VERB ("FileClose", command_close), |