Merge lp:~ajalkane/ubuntu-filemanager-app/remove-hack-around-fixed-backend-bug into lp:ubuntu-filemanager-app

Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 29
Merged at revision: 29
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/remove-hack-around-fixed-backend-bug
Merge into: lp:ubuntu-filemanager-app
Diff against target: 23 lines (+5/-8)
1 file modified
FileOperationProgressDialog.qml (+5/-8)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/remove-hack-around-fixed-backend-bug
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+164215@code.launchpad.net

Commit message

Removed hack that by-passed folderlist plugin bug that has been fixed.

Description of the change

Removed hack that by-passed folderlist plugin bug that has been fixed.

To post a comment you must log in.
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Tested and good to go

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FileOperationProgressDialog.qml'
2--- FileOperationProgressDialog.qml 2013-04-17 17:55:41 +0000
3+++ FileOperationProgressDialog.qml 2013-05-16 15:35:32 +0000
4@@ -49,14 +49,11 @@
5 onProgress: {
6 console.log("On progress ", curItem, totalItems, percent)
7 progress.value = percent
8- // TODO: is this a bug in backend? The first received signal is curItem=0, totalItems=0. Work around:
9- if (!(curItem == 0 && totalItems == 0)) {
10- if (curItem == totalItems) {
11- console.log("All files processed, closing progress dialog")
12- PopupUtils.close(root)
13- } else {
14- root.text = descriptionPrepend + " " + curItem + "/" + totalItems
15- }
16+ if (curItem == totalItems) {
17+ console.log("All files processed, closing progress dialog")
18+ PopupUtils.close(root)
19+ } else {
20+ root.text = descriptionPrepend + " " + curItem + "/" + totalItems
21 }
22 }
23 }

Subscribers

People subscribed via source and target branches