callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If we can't create a folder because it already exists, select that folder

Browse Source 
2001-07-30  Jason Leach  <jleach@ximian.com>

	* e-shell-folder-creation-dialog.c (async_create_cb): If we can't
	create a folder because it already exists, select that folder that
	exists.  Bug #1716.

svn path=/trunk/; revision=11482
This commit is contained in:
Jason Leach
2001-07-30 19:21:01 +00:00
committed by Jacob Leach
parent 8438ce6564
commit 116e504828
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ChangeLog
View File

@ -1,3 +1,9 @@
2001-07-30 Jason Leach <jleach@ximian.com>
* e-shell-folder-creation-dialog.c (async_create_cb): If we can't
create a folder because it already exists, select that folder that
exists. Bug #1716.
2001-07-30 Frederic Crozat <fcrozat@mandrakesoft.com>
* main.c (main): call gconf_init if gtkhtml is compiled with gconf

12
shell/e-shell-folder-creation-dialog.c
View File

@ -86,6 +86,7 @@ async_create_cb (EStorageSet *storage_set,
dialog_data = (DialogData *) data;
if (result == E_STORAGE_OK) {
/* Success! Tell the callback of this, then return */
if (dialog_data->result_callback != NULL)
(* dialog_data->result_callback) (dialog_data->shell,
E_SHELL_FOLDER_CREATION_DIALOG_RESULT_SUCCESS,
@ -93,8 +94,19 @@ async_create_cb (EStorageSet *storage_set,
dialog_data->result_callback_data);
gtk_widget_destroy (dialog_data->dialog);
return;
} else if (result == E_STORAGE_EXISTS) {
e_storage_set_view_set_current_folder (E_STORAGE_SET_VIEW (dialog_data->storage_set_view),
dialog_data->folder_path);
}
/* Tell the callback something failed, then popup a dialog
explaining how it failed */
if (dialog_data->result_callback != NULL)
(* dialog_data->result_callback) (dialog_data->shell,
E_SHELL_FOLDER_CREATION_DIALOG_RESULT_FAIL,
dialog_data->folder_path,
dialog_data->result_callback_data);
e_notice (GTK_WINDOW (dialog_data->dialog), GNOME_MESSAGE_BOX_ERROR,
_("Cannot create the specified folder:\n%s"),
e_storage_result_to_string (result));