[Xfce4-commits] [xfce/thunar] 01/01: Fix endless rename loop in case of error on the properties dialog (bug #11557)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

hjudt pushed a commit to branch master
in repository xfce/thunar.

commit 2733416ce2ddc6118126a12f7c951830592b8f13
Author: Harald Judt <h.judt at gmx.at>
Date:   Fri Feb 20 19:58:49 2015 +0100

    Fix endless rename loop in case of error on the properties dialog (bug #11557)
    
    Fix loop triggered by focus out event, which calls activate after the
    error dialog closes and thus reattempts another rename operation.
---
 thunar/thunar-properties-dialog.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index b07296e..5b0769a 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -678,6 +678,12 @@ thunar_properties_dialog_rename_error (ExoJob                 *job,
   _thunar_return_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog));
   _thunar_return_if_fail (g_list_length (dialog->files) == 1);
 
+  /* reset the entry display name to the original name, so the focus
+     out event does not trigger the rename again by calling
+     thunar_properties_dialog_name_activate */
+  gtk_entry_set_text (GTK_ENTRY (dialog->name_entry),
+                      thunar_file_get_display_name (THUNAR_FILE (dialog->files->data)));
+
   /* display an error message */
   thunar_dialogs_show_error (GTK_WIDGET (dialog), error, _("Failed to rename \"%s\""),
                              thunar_file_get_display_name (THUNAR_FILE (dialog->files->data)));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.