Merge lp:~jeremywootten/pantheon-files/fix-rename-new-file into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix rename new file regression

This branch increases the delay before renaming a newly created file. This is to give more time for the file item to appear in the view before trying to rename.

In addition, a duplicate "add file" signal is inhibited (one is initiated by marlin_file_operations and one by the directory.monitor).

Better solutions are probably available but would require more extensive refactoring, risking further regressions.

[PerfectCarl (name-is-carl)]

I don't like the solution that is to add another hard coded delay, either.

But this fix should land.

Delays/async/and other threading issues that currently make files laggy and unpredictable will be addressed in another issue.

[PerfectCarl (name-is-carl)]

I haven't ran the full test suite [1] but I checked that the issue is fixed with some quick regression check

[1]: https://github.com/PerfectCarl/elementary-files-testing/blob/master/rename.md

review: Approve

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-01-24 12:31:20 +0000
+++ src/View/AbstractDirectoryView.vala	2015-01-28 09:15:22 +0000
@@ -767,6 +767,8 @@
             if (parent_uri == null)
                 parent_uri = slot.directory.file.uri;
 
+            /* Block the async directory file monitor to avoid generating unwanted "add-file" events */
+            slot.directory.block_monitor ();
             Marlin.FileOperations.new_file (this as Gtk.Widget,
                                             null,
                                             parent_uri,
@@ -800,8 +802,9 @@
             var view = (FM.AbstractDirectoryView)data;
             var file_to_rename = GOF.File.@get (new_file);
             /* Allow time for the file to appear in the tree model before renaming */
-            GLib.Timeout.add (50, () => {
+            GLib.Timeout.add (250, () => {
                 view.rename_file (file_to_rename);
+                view.slot.directory.unblock_monitor ();
                 return false;
             });
         }
@@ -1949,6 +1952,8 @@
         /** Menu action functions */
 
         private void create_from_template (GOF.File template) {
+            /* Block the async directory file monitor to avoid generating unwanted "add-file" events */
+            slot.directory.block_monitor ();
             Marlin.FileOperations.new_file_from_template (this,
                                                           null,
                                                           slot.location,