Merge branch 'fix-issue-2604' into 'gtk-3-24'
Fix message dialog not shown when the user tries to create a folder but a file... See merge request GNOME/gtk!1676
This commit is contained in:
commit
476afca97d
@ -813,14 +813,13 @@ error_creating_folder_dialog (GtkFileChooserWidget *impl,
|
|||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
error_creating_folder_over_existing_file_dialog (GtkFileChooserWidget *impl,
|
error_creating_folder_over_existing_file_dialog (GtkFileChooserWidget *impl,
|
||||||
GFile *file,
|
GFile *file)
|
||||||
GError *error)
|
|
||||||
{
|
{
|
||||||
error_dialog (impl,
|
error_message (impl,
|
||||||
_("The folder could not be created, as a file with the same "
|
_("The folder could not be created, as a file with the same "
|
||||||
"name already exists. Try using a different name for the "
|
"name already exists."),
|
||||||
"folder, or rename the file first."),
|
_("Try using a different name for the folder, or rename the "
|
||||||
error);
|
"file first."));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -6843,8 +6842,7 @@ file_exists_get_info_cb (GCancellable *cancellable,
|
|||||||
/* Oops, the user typed the name of an existing path which is not
|
/* Oops, the user typed the name of an existing path which is not
|
||||||
* a folder
|
* a folder
|
||||||
*/
|
*/
|
||||||
error_creating_folder_over_existing_file_dialog (impl, data->file,
|
error_creating_folder_over_existing_file_dialog (impl, data->file);
|
||||||
g_error_copy (error));
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user