Merge lp://staging/~evfool/scratch/lp1342286 into lp://staging/~elementary-apps/scratch/scratch

Proposed by Robert Roth
Status: Merged
Approved by: Cody Garver
Approved revision: 1327
Merged at revision: 1328
Proposed branch: lp://staging/~evfool/scratch/lp1342286
Merge into: lp://staging/~elementary-apps/scratch/scratch
Diff against target: 93 lines (+22/-18)
2 files modified
plugins/folder-manager/FileView.vala (+20/-16)
plugins/folder-manager/FolderManagerPlugin.vala (+2/-2)
To merge this branch: bzr merge lp://staging/~evfool/scratch/lp1342286
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+226947@code.staging.launchpad.net

Commit message

Do not use deprecated stock items and SourceList.set_sort_func and fix sorting folders before files in folder-manager plugin (lp:1342286)

Description of the change

This branch includes the following changes:
* do not use deprecated SourceList.set_sort_func, use SourceListSortable instead, and add a compare method to always sort folders before files
* do not use deprecated GTK stock items, replace them according to the stock items migration guide [1]

[1] https://docs.google.com/spreadsheet/pub?key=0AsPAM3pPwxagdGF4THNMMUpjUW5xMXZfdUNzMXhEa2c&output=html

To post a comment you must log in.
Revision history for this message
Cassidy James Blaede (cassidyjames) wrote :

Tested and the result is correct. I'll wait for someone from the apps team to review the code, though.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches