libubuntuone

Merge lp:~vds/libubuntuone/fix_bug_541912 into lp:libubuntuone

  1. fix_bug_541912
  2. Merge into trunk
Proposed by Vincenzo Di Somma
Status: Merged
Approved by: Tim Cole
Approved revision: 76
Merged at revision: not available
Proposed branch: lp:~vds/libubuntuone/fix_bug_541912
Merge into: lp:libubuntuone
Diff against target: 12 lines (+1/-1)
1 file modified
libubuntuone/u1-music-store.c (+1/-1)
To merge this branch: bzr merge lp:~vds/libubuntuone/fix_bug_541912
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
Tim Cole (community) Approve
Review via email: mp+22871@code.launchpad.net

Commit message

Use 'downloaded' instead of 'read' for progress string

Description of the change

That was easy...

To post a comment you must log in.
Revision history for this message
Tim Cole (tcole) :
review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Looks good. Please don't mark it as approved yet, since I need to merge another branch (which was for the latest release tarball done on Thursday) before merging this one, so that the bzr log history doesn't get screwed up for next release notes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntuone/u1-music-store.c'
2--- libubuntuone/u1-music-store.c 2010-03-29 17:07:31 +0000
3+++ libubuntuone/u1-music-store.c 2010-04-06 15:11:22 +0000
4@@ -633,7 +633,7 @@
5 percent = (gdouble) download->n_bytes_read / (gdouble) download->deflated_size;
6 else
7 percent = 0.0;
8- script = g_strdup_printf ("setProgressBar('%s', %.2f, '%.1fMB of %.1fMB read');",
9+ script = g_strdup_printf ("setProgressBar('%s', %.2f, '%.1fMB of %.1fMB downloaded');",
10 escaped_prop->str, percent,
11 (gdouble) download->n_bytes_read / (gdouble) 1024 / (gdouble) 1024,
12 (gdouble) download->deflated_size / (gdouble) 1024 / (gdouble) 1024);

Subscribers

People subscribed via source and target branches