[Finish fixing #11645.]

* e-shell-folder-commands.c (xfer_result_callback): Don't update
the shortcuts here anymore since now the shell takes care of it.

* e-shell.c (storage_set_moved_folder_callback): New callback for
EStorageSetView::folder_moved; update the shortcuts.
(e_shell_construct): Connect.

* e-storage-set.c: Renamed StorageConverterCallbackData to
StorageCallbackData.  New members destination_folder,
source_folder, operation in it.
(class_init): Install "moved_folder" signal.
(storage_callback_data_new): Renamed from
storage_converter_callback_data_new.
(storage_callback_data_free): New.
(storage_callback): Renamed from storage_callback_converter.  Use
storage_callback_data_free().
(e_storage_set_async_create_folder): Updated to use the
storage_callback and storage_callback_data_new().
(e_storage_set_async_remove_folder): Likewise.
(e_storage_set_async_xfer_folder): Likewise.

* e-storage-set.h: New signal "moved_folder".

svn path=/trunk/; revision=18216

1 files changed, 5 insertions, 4 deletions

diff --git a/shell/e-storage.h b/shell/e-storage.h
index 22d87de8f9..43ad6f442b 100644
--- a/shell/e-storage.h
+++ b/shell/e-storage.h
@@ -78,10 +78,10 @@ struct _EStorageClass {
 
 	/* Signals.  */
 
-	void * (* new_folder)     (EStorage *storage, const char *path);
-	void * (* updated_folder) (EStorage *storage, const char *path);
-	void * (* removed_folder) (EStorage *storage, const char *path);
-	void * (* close_folder)   (EStorage *storage, const char *path);
+	void (* new_folder)     (EStorage *storage, const char *path);
+	void (* updated_folder) (EStorage *storage, const char *path);
+	void (* removed_folder) (EStorage *storage, const char *path);
+	void (* close_folder)   (EStorage *storage, const char *path);
 
 	/* Virtual methods.  */
 
@@ -110,6 +110,7 @@ struct _EStorageClass {
 
 	void         (* async_open_folder)    (EStorage *storage,
 					       const char *path);
+
 };