mtp

Merge lp:~cyphermox/mtp/lp1383861 into lp:mtp

Proposed by Mathieu Trudel-Lapierre on 2014-10-22
Status: Approved
Approved by: Manuel de la Peña on 2014-10-24
Approved revision: 53
Proposed branch: lp:~cyphermox/mtp/lp1383861
Merge into: lp:mtp
Diff against target: 20 lines (+1/-6)
1 file modified
server/server.cpp (+1/-6)
To merge this branch: bzr merge lp:~cyphermox/mtp/lp1383861
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) 2014-10-22 Approve on 2014-10-24
PS Jenkins bot continuous-integration Approve on 2014-10-22
Review via email: mp+239273@code.launchpad.net

Commit message

Don't use product name for naming internal storage, just call it Internal Storage.

Description of the change

Don't use product name for naming internal storage, just call it Internal Storage.

To post a comment you must log in.

Unmerged revisions

53. By Mathieu Trudel-Lapierre on 2014-10-21

Don't use product name for naming internal storage, just call it Internal Storage.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'server/server.cpp'
2--- server/server.cpp 2014-09-04 01:11:14 +0000
3+++ server/server.cpp 2014-10-22 19:18:17 +0000
4@@ -285,15 +285,10 @@
5
6 void initStorage()
7 {
8- char product_name[PROP_VALUE_MAX];
9-
10- // Local storage
11- property_get ("ro.product.model", product_name, "Ubuntu Touch device");
12-
13 home_storage = new MtpStorage(
14 MTP_STORAGE_FIXED_RAM,
15 userdata->pw_dir,
16- product_name,
17+ gettext("Internal Storage"),
18 1024 * 1024 * 100, /* 100 MB reserved space, to avoid filling the disk */
19 false,
20 1024 * 1024 * 1024 * 2 /* 2GB arbitrary max file size */);

Subscribers

People subscribed via source and target branches