AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

file chooser: Allow rename-to-self

Browse Source 
When checking for a name clash for renaming, don't complain if the
name is unchanged. That's harmless.
This commit is contained in:
Matthias Clasen 2015-07-06 21:39:39 -04:00
parent 7c9e3df198
commit 06f9102840
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkfilechooserwidget.c
View File

@ -1022,6 +1022,7 @@ check_valid_child_name (GtkFileChooserWidget *impl,
GFile *parent, GFile *parent,
const gchar *name, const gchar *name,
gboolean is_folder, gboolean is_folder,
GFile *original,
GtkWidget *error_label, GtkWidget *error_label,
GtkWidget *button) GtkWidget *button)
{ {
@ -1056,6 +1057,11 @@ check_valid_child_name (GtkFileChooserWidget *impl,
gtk_label_set_text (GTK_LABEL (error_label), error->message); gtk_label_set_text (GTK_LABEL (error_label), error->message);
g_error_free (error); g_error_free (error);
} }
else if (original && g_file_equal (original, file))
{
gtk_widget_set_sensitive (button, TRUE);
g_object_unref (file);
}
else else
{ {
struct FileExistsData *data; struct FileExistsData *data;
@ -1106,6 +1112,7 @@ new_folder_name_changed (GtkEntry *entry,
priv->current_folder, priv->current_folder,
gtk_entry_get_text (entry), gtk_entry_get_text (entry),
TRUE, TRUE,
NULL,
priv->new_folder_error_label, priv->new_folder_error_label,
priv->new_folder_create_button); priv->new_folder_create_button);
} }
@ -1532,6 +1539,7 @@ rename_file_name_changed (GtkEntry *entry,
priv->current_folder, priv->current_folder,
gtk_entry_get_text (entry), gtk_entry_get_text (entry),
file_type == G_FILE_TYPE_DIRECTORY, file_type == G_FILE_TYPE_DIRECTORY,
priv->rename_file_source_file,
priv->rename_file_error_label, priv->rename_file_error_label,
priv->rename_file_rename_button); priv->rename_file_rename_button);
} }