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

Proposed by Jeremy Wootten
Status: Merged
Approved by: Cody Garver
Approved revision: 1360
Merged at revision: 1368
Proposed branch: lp:~jeremywootten/pantheon-files/fix-1178869
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 50 lines (+6/-3)
2 files modified
src/fm-directory-view.c (+5/-2)
src/fm-directory-view.h (+1/-1)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/fix-1178869
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
David Gomes (community) Needs Fixing
Review via email: mp+191919@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
David Gomes (davidgomes) wrote :

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
Revision history for this message
Cody Garver (codygarver) :
review: Approve
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

> 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".

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

> > 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/fm-directory-view.c'
2--- src/fm-directory-view.c 2013-09-29 17:01:20 +0000
3+++ src/fm-directory-view.c 2013-10-20 12:27:42 +0000
4@@ -2341,7 +2341,6 @@
5 }
6 }
7
8-#if 0
9 void
10 fm_directory_view_select_gof_file (FMDirectoryView *view, GOFFile *file)
11 {
12@@ -2357,7 +2356,6 @@
13 (*FM_DIRECTORY_VIEW_GET_CLASS (view)->set_cursor) (view, path, FALSE, TRUE);
14 gtk_tree_path_free (path);
15 }
16-#endif
17
18 void
19 fm_directory_view_select_glib_files (FMDirectoryView *view, GList *files)
20@@ -3338,12 +3336,17 @@
21 static gboolean
22 rename_file_callback (FMDirectoryView *view)
23 {
24+ if (view->details->newly_folder_added)
25+ fm_directory_view_select_gof_file (view, view->details->newly_folder_added);
26+
27 rename_file (view, view->details->newly_folder_added);
28 g_object_unref (view->details->newly_folder_added);
29
30 return FALSE;
31 }
32
33+/* This function is also called after creating a new file */
34+/* The parameter new_folder may be either a folder or a file */
35 static void
36 new_folder_done (GFile *new_folder, gpointer data)
37 {
38
39=== modified file 'src/fm-directory-view.h'
40--- src/fm-directory-view.h 2013-08-10 20:15:26 +0000
41+++ src/fm-directory-view.h 2013-10-20 12:27:42 +0000
42@@ -435,7 +435,7 @@
43 GAppInfo *fm_directory_view_get_default_app (FMDirectoryView *view);
44
45 void fm_directory_view_select_first_for_empty_selection (FMDirectoryView *view);
46-//void fm_directory_view_select_gof_file (FMDirectoryView *view, GOFFile *file);
47+void fm_directory_view_select_gof_file (FMDirectoryView *view, GOFFile *file);
48 void fm_directory_view_select_glib_files (FMDirectoryView *view, GList *files);
49
50 #endif /* FM_DIRECTORY_VIEW_H */

Subscribers

People subscribed via source and target branches

to all changes: