diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-09-26 07:01:33 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-09-26 07:01:33 +0800 |
| commit | 58755d5604d35422d133c39aab785078a40fb8b4 (patch) | |
| tree | 7165ced9ace8d48f596dff2908fb436d4594319e /shell/e-storage-set-view.c | |
| parent | 3420538a5c595b67da2a59c590a7aa628046ffb7 (diff) | |
| download | gsoc2013-evolution-58755d5604d35422d133c39aab785078a40fb8b4.tar gsoc2013-evolution-58755d5604d35422d133c39aab785078a40fb8b4.tar.gz gsoc2013-evolution-58755d5604d35422d133c39aab785078a40fb8b4.tar.bz2 gsoc2013-evolution-58755d5604d35422d133c39aab785078a40fb8b4.tar.lz gsoc2013-evolution-58755d5604d35422d133c39aab785078a40fb8b4.tar.xz gsoc2013-evolution-58755d5604d35422d133c39aab785078a40fb8b4.tar.zst gsoc2013-evolution-58755d5604d35422d133c39aab785078a40fb8b4.zip | |
[Implemented the "Rename" command. Warning, it doesn't quite work
yet, as there seems to be something wrong still.]
* e-storage.c (e_storage_async_xfer_folder): Ooops. Make the
check for CANTMOVETODESCENDANT really work.
* e-storage-set-view.c (tree_drag_data_received): Pass the
EStorageSetView as the data for the async_xfer function.
(folder_xfer_callback): Display an error dialog if something goes
wrong.
* e-shell-view-menu.c (command_rename_folder): Enable again.
* e-shell-folder-commands.c (e_shell_command_rename_folder):
Re-implemented.
(delete_dialog): Use double quotes instead of single quotes around
the folder name, for consistency with the other dialogs.
svn path=/trunk/; revision=13131
Diffstat (limited to 'shell/e-storage-set-view.c')
| -rw-r--r-- | shell/e-storage-set-view.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 2a86048185..fe941b2715 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -33,6 +33,7 @@ #include <libgnome/gnome-defs.h> #include <libgnome/gnome-util.h> #include <gal/util/e-util.h> +#include <gal/widgets/e-gui-utils.h> #include <gal/e-table/e-tree-memory-callbacks.h> #include <gal/e-table/e-cell-tree.h> #include <gal/e-table/e-cell-text.h> @@ -632,7 +633,15 @@ folder_xfer_callback (EStorageSet *storage_set, EStorageResult result, void *data) { - g_print ("Folder Xfer result -- %s\n", e_storage_result_to_string (result)); + EStorageSetView *storage_set_view; + + storage_set_view = E_STORAGE_SET_VIEW (data); + + if (result != E_STORAGE_OK) + e_notice (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (storage_set_view))), + GNOME_MESSAGE_BOX_ERROR, + _("Cannot transfer folder:\n%s"), + e_storage_result_to_string (result)); } @@ -1151,12 +1160,12 @@ tree_drag_data_received (ETree *etree, switch (context->action) { case GDK_ACTION_MOVE: e_storage_set_async_xfer_folder (priv->storage_set, source_path, destination_path, TRUE, - folder_xfer_callback, NULL); + folder_xfer_callback, storage_set_view); handled = TRUE; break; case GDK_ACTION_COPY: e_storage_set_async_xfer_folder (priv->storage_set, source_path, destination_path, FALSE, - folder_xfer_callback, NULL); + folder_xfer_callback, storage_set_view); handled = TRUE; break; default: |