From 5cad911e506616c53e40d1ecef0594d83adaba5e Mon Sep 17 00:00:00 2001 From: Doug Turner Date: Thu, 30 Aug 2012 15:17:39 -0700 Subject: [PATCH] Bug 785973 - Device Storage - On gaia, default to use /sdcard (not directories under /sdcard). r=djf --- dom/devicestorage/nsDeviceStorage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp index 287ff7ec0a0..161e947938d 100644 --- a/dom/devicestorage/nsDeviceStorage.cpp +++ b/dom/devicestorage/nsDeviceStorage.cpp @@ -544,7 +544,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType) // Picture directory if (aType.Equals(NS_LITERAL_STRING("pictures"))) { #ifdef MOZ_WIDGET_GONK - NS_NewLocalFile(NS_LITERAL_STRING("/sdcard/DCIM"), false, getter_AddRefs(f)); + NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f)); #elif defined (MOZ_WIDGET_COCOA) dirService->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f)); #elif defined (XP_UNIX) @@ -555,7 +555,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType) // Video directory else if (aType.Equals(NS_LITERAL_STRING("videos"))) { #ifdef MOZ_WIDGET_GONK - NS_NewLocalFile(NS_LITERAL_STRING("/sdcard/Movies"), false, getter_AddRefs(f)); + NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f)); #elif defined (MOZ_WIDGET_COCOA) dirService->Get(NS_OSX_MOVIE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f)); #elif defined (XP_UNIX) @@ -566,7 +566,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType) // Music directory else if (aType.Equals(NS_LITERAL_STRING("music"))) { #ifdef MOZ_WIDGET_GONK - NS_NewLocalFile(NS_LITERAL_STRING("/sdcard/Music"), false, getter_AddRefs(f)); + NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f)); #elif defined (MOZ_WIDGET_COCOA) dirService->Get(NS_OSX_MUSIC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f)); #elif defined (XP_UNIX)