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

[Mathieu Trudel-Lapierre]

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/mtp-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/mtp-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/26/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

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.

=== modified file 'server/server.cpp'
--- server/server.cpp	2014-09-04 01:11:14 +0000
+++ server/server.cpp	2014-10-22 19:18:17 +0000
@@ -285,15 +285,10 @@
 
     void initStorage()
     {
-        char product_name[PROP_VALUE_MAX];
-
-        // Local storage
-        property_get ("ro.product.model", product_name, "Ubuntu Touch device");
-
         home_storage = new MtpStorage(
             MTP_STORAGE_FIXED_RAM, 
             userdata->pw_dir,
-	    product_name,
+            gettext("Internal Storage"),
             1024 * 1024 * 100,  /* 100 MB reserved space, to avoid filling the disk */
             false,
             1024 * 1024 * 1024 * 2  /* 2GB arbitrary max file size */);