[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
This commit is contained in:
@ -149,21 +149,6 @@ xfer_result_callback (EStorageSet *storage_set,
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
if (folder_command_data->command == FOLDER_COMMAND_MOVE) {
|
||||
char *source_uri;
|
||||
char *destination_uri;
|
||||
|
||||
source_uri = g_strconcat (E_SHELL_URI_PREFIX, folder_command_data->source_path, NULL);
|
||||
destination_uri = g_strconcat (E_SHELL_URI_PREFIX, folder_command_data->destination_path, NULL);
|
||||
|
||||
e_shortcuts_update_shortcuts_for_changed_uri
|
||||
(e_shell_get_shortcuts (folder_command_data->shell),
|
||||
source_uri, destination_uri);
|
||||
|
||||
g_free (source_uri);
|
||||
g_free (destination_uri);
|
||||
}
|
||||
|
||||
folder_command_data_free (folder_command_data);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user