Merge lp:~xapantu/pantheon-files/fix-1083102 into lp:~elementary-apps/pantheon-files/trunk

Proposed by xapantu
Status: Merged
Merged at revision: 1517
Proposed branch: lp:~xapantu/pantheon-files/fix-1083102
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 24 lines (+9/-0)
1 file modified
libcore/gof-file.c (+9/-0)
To merge this branch: bzr merge lp:~xapantu/pantheon-files/fix-1083102
Reviewer Review Type Date Requested Status
Robert Roth (community) Needs Fixing
Review via email: mp+225323@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Roth (evfool) wrote :

Please use spaces instead of tabs. Other than that, the solution is fine.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libcore/gof-file.c'
2--- libcore/gof-file.c 2014-06-05 06:52:48 +0000
3+++ libcore/gof-file.c 2014-07-02 13:29:22 +0000
4@@ -1123,12 +1123,21 @@
5 break;
6 case FM_LIST_MODEL_SIZE:
7 result = compare_by_size (file1, file2);
8+ if(result == 0) {
9+ result = compare_by_display_name (file1, file2);
10+ }
11 break;
12 case FM_LIST_MODEL_TYPE:
13 result = compare_by_type (file1, file2);
14+ if(result == 0) {
15+ result = compare_by_display_name (file1, file2);
16+ }
17 break;
18 case FM_LIST_MODEL_MODIFIED:
19 result = compare_by_time (file1, file2);
20+ if(result == 0) {
21+ result = compare_by_display_name (file1, file2);
22+ }
23 break;
24 }
25

Subscribers

People subscribed via source and target branches

to all changes: