Merge lp:~jeremywootten/pantheon-files/fix-1178869 into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fixes bug 1178869 by selecting the newly created file or folder before renaming.

Fixes bug 1178869 by selecting the newly created file or folder before renaming.

[David Gomes (davidgomes)]

I think you should also include on this branch changing the 'new_folder' variable name because it seems to be called for files too.

review: Needs Fixing

[Cody Garver (codygarver)]

review: Approve

[Jeremy Wootten (jeremywootten)]

> I think you should also include on this branch changing the 'new_folder'
> variable name because it seems to be called for files too.

OK, I can do that. Wasn't sure if it was "allowed".

[Jeremy Wootten (jeremywootten)]

> > I think you should also include on this branch changing the 'new_folder'
> > variable name because it seems to be called for files too.
>
> OK, I can do that. Wasn't sure if it was "allowed".

If this is done, it would make sense to change the name of the function "newly_folder_done" and the variable view->details->newly_folder_added as well.

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2013-09-29 17:01:20 +0000
+++ src/fm-directory-view.c	2013-10-20 12:27:42 +0000
@@ -2341,7 +2341,6 @@
     }
 }
 
-#if 0
 void
 fm_directory_view_select_gof_file (FMDirectoryView *view, GOFFile *file)
 {
@@ -2357,7 +2356,6 @@
     (*FM_DIRECTORY_VIEW_GET_CLASS (view)->set_cursor) (view, path, FALSE, TRUE);
     gtk_tree_path_free (path);
 }
-#endif
 
 void
 fm_directory_view_select_glib_files (FMDirectoryView *view, GList *files)
@@ -3338,12 +3336,17 @@
 static gboolean
 rename_file_callback (FMDirectoryView *view)
 {
+    if (view->details->newly_folder_added)
+        fm_directory_view_select_gof_file (view, view->details->newly_folder_added);
+
     rename_file (view, view->details->newly_folder_added);
     g_object_unref (view->details->newly_folder_added);
 
     return FALSE;
 }
 
+/* This function is also called after creating a new file */
+/* The parameter new_folder may be either a folder or a file */
 static void
 new_folder_done (GFile *new_folder, gpointer data)
 {
 
=== modified file 'src/fm-directory-view.h'
--- src/fm-directory-view.h	2013-08-10 20:15:26 +0000
+++ src/fm-directory-view.h	2013-10-20 12:27:42 +0000
@@ -435,7 +435,7 @@
 GAppInfo *fm_directory_view_get_default_app (FMDirectoryView *view);
 
 void    fm_directory_view_select_first_for_empty_selection (FMDirectoryView *view);
-//void    fm_directory_view_select_gof_file (FMDirectoryView *view, GOFFile *file);
+void    fm_directory_view_select_gof_file (FMDirectoryView *view, GOFFile *file);
 void    fm_directory_view_select_glib_files (FMDirectoryView *view, GList *files);
 
 #endif /* FM_DIRECTORY_VIEW_H */