1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1559294891 -7200 |
3 # Date 1559294891 -7200 |
4 # Fri May 31 11:28:11 2019 +0200 |
4 # Fri May 31 11:28:11 2019 +0200 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
6 # Parent 52a515e07938d75f7c33e7b724845ce6dc315c0c |
6 # Parent 48866e4a200fb5299b94af4d9841e38336cff9f4 |
7 Description: Add KDE integration to Firefox (toolkit parts) |
7 Description: Add KDE integration to Firefox (toolkit parts) |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
9 Author: Lubos Lunak <lunak@suse.com> |
9 Author: Lubos Lunak <lunak@suse.com> |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
12 |
12 |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
16 @@ -88,16 +88,17 @@ |
16 @@ -84,16 +84,17 @@ |
17 #include "nsXPCOM.h" |
17 #include "nsXPCOM.h" |
18 #include "nsXULAppAPI.h" |
18 #include "nsXULAppAPI.h" |
19 #include "nsZipArchive.h" |
19 #include "nsZipArchive.h" |
20 #include "plbase64.h" |
20 #include "plbase64.h" |
21 #include "PLDHashTable.h" |
21 #include "PLDHashTable.h" |
29 #endif |
29 #endif |
30 |
30 |
31 #ifdef MOZ_MEMORY |
31 #ifdef MOZ_MEMORY |
32 # include "mozmemory.h" |
32 # include "mozmemory.h" |
33 #endif |
33 #endif |
34 @@ -4543,25 +4544,37 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4539,25 +4540,37 @@ nsresult Preferences::InitInitialObjects |
35 // application pref files for backwards compatibility. |
35 // application pref files for backwards compatibility. |
36 static const char* specialFiles[] = { |
36 static const char* specialFiles[] = { |
37 #if defined(XP_MACOSX) |
37 #if defined(XP_MACOSX) |
38 "macprefs.js" |
38 "macprefs.js" |
39 #elif defined(XP_WIN) |
39 #elif defined(XP_WIN) |
67 NS_WARNING("Error parsing application default preferences."); |
67 NS_WARNING("Error parsing application default preferences."); |
68 } |
68 } |
69 |
69 |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
72 @@ -4607,17 +4620,17 @@ nsresult Preferences::InitInitialObjects |
72 @@ -4603,17 +4616,17 @@ nsresult Preferences::InitInitialObjects |
73 } |
73 } |
74 |
74 |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
76 if (!path) { |
76 if (!path) { |
77 continue; |
77 continue; |
134 flags = Flags('contentaccessible=yes', 'appversion>=3.5') |
134 flags = Flags('contentaccessible=yes', 'appversion>=3.5') |
135 ''' |
135 ''' |
136 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py |
136 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py |
137 --- a/python/mozbuild/mozpack/chrome/manifest.py |
137 --- a/python/mozbuild/mozpack/chrome/manifest.py |
138 +++ b/python/mozbuild/mozpack/chrome/manifest.py |
138 +++ b/python/mozbuild/mozpack/chrome/manifest.py |
139 @@ -36,16 +36,17 @@ class ManifestEntry(object): |
139 @@ -37,16 +37,17 @@ class ManifestEntry(object): |
140 'platformversion', |
140 'platformversion', |
141 'os', |
141 'os', |
142 'osversion', |
142 'osversion', |
143 'abi', |
143 'abi', |
144 'xpcnativewrappers', |
144 'xpcnativewrappers', |
173 with Files('**'): |
173 with Files('**'): |
174 BUG_COMPONENT = ('Toolkit', 'Downloads API') |
174 BUG_COMPONENT = ('Toolkit', 'Downloads API') |
175 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
175 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
176 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
176 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
177 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
177 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
178 @@ -1199,36 +1199,66 @@ nsUnknownContentTypeDialog.prototype = { |
178 @@ -1195,36 +1195,66 @@ nsUnknownContentTypeDialog.prototype = { |
179 params.handlerApp && |
179 params.handlerApp && |
180 params.handlerApp.executable && |
180 params.handlerApp.executable && |
181 params.handlerApp.executable.isFile() |
181 params.handlerApp.executable.isFile() |
182 ) { |
182 ) { |
183 // Remember the file they chose to run. |
183 // Remember the file they chose to run. |
263 nsIFilePicker.modeOpen |
263 nsIFilePicker.modeOpen |
264 ); |
264 ); |
265 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
265 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
266 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
266 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
267 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
267 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
268 @@ -14,16 +14,17 @@ |
268 @@ -13,16 +13,17 @@ |
269 #include "nsPrintfCString.h" |
269 #include "nsPrintfCString.h" |
270 #include "nsNetCID.h" |
270 #include "nsNetCID.h" |
271 #include "nsNetUtil.h" |
271 #include "nsNetUtil.h" |
272 #include "nsISupportsPrimitives.h" |
272 #include "nsISupportsPrimitives.h" |
273 #include "nsIGSettingsService.h" |
273 #include "nsIGSettingsService.h" |
281 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
281 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
282 public: |
282 public: |
283 NS_DECL_ISUPPORTS |
283 NS_DECL_ISUPPORTS |
284 NS_DECL_NSISYSTEMPROXYSETTINGS |
284 NS_DECL_NSISYSTEMPROXYSETTINGS |
285 |
285 |
286 @@ -37,16 +38,18 @@ class nsUnixSystemProxySettings final : |
286 @@ -36,16 +37,18 @@ class nsUnixSystemProxySettings final : |
287 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
287 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
288 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> |
288 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> |
289 mSchemeProxySettings; |
289 mSchemeProxySettings; |
290 nsresult GetProxyFromGSettings(const nsACString& aScheme, |
290 nsresult GetProxyFromGSettings(const nsACString& aScheme, |
291 const nsACString& aHost, int32_t aPort, |
291 const nsACString& aHost, int32_t aPort, |
300 |
300 |
301 NS_IMETHODIMP |
301 NS_IMETHODIMP |
302 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
302 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
303 // dbus prevents us from being threadsafe, but this routine should not block |
303 // dbus prevents us from being threadsafe, but this routine should not block |
304 // anyhow |
304 // anyhow |
305 @@ -381,21 +384,50 @@ nsresult nsUnixSystemProxySettings::GetP |
305 @@ -380,21 +383,50 @@ nsresult nsUnixSystemProxySettings::GetP |
306 return NS_OK; |
306 return NS_OK; |
307 } |
307 } |
308 |
308 |
309 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
309 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
310 const nsACString& aScheme, |
310 const nsACString& aScheme, |
354 return result.forget().downcast<nsISupports>(); |
354 return result.forget().downcast<nsISupports>(); |
355 } |
355 } |
356 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
356 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
357 --- a/toolkit/xre/moz.build |
357 --- a/toolkit/xre/moz.build |
358 +++ b/toolkit/xre/moz.build |
358 +++ b/toolkit/xre/moz.build |
359 @@ -87,17 +87,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
359 @@ -88,17 +88,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
360 '../components/printingui', |
360 '../components/printingui', |
361 ] |
361 ] |
362 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
362 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
363 UNIFIED_SOURCES += [ |
363 UNIFIED_SOURCES += [ |
364 'nsNativeAppSupportDefault.cpp', |
364 'nsNativeAppSupportDefault.cpp', |
1211 #endif |
1211 #endif |
1212 #include "nsISupports.h" |
1212 #include "nsISupports.h" |
1213 #include "nsString.h" |
1213 #include "nsString.h" |
1214 #include "nsReadableUtils.h" |
1214 #include "nsReadableUtils.h" |
1215 #include "nsUnicharUtils.h" |
1215 #include "nsUnicharUtils.h" |
1216 #include "nsIURL.h" |
|
1217 #include "nsIFileStreams.h" |
1216 #include "nsIFileStreams.h" |
1218 #include "nsILineInputStream.h" |
1217 #include "nsILineInputStream.h" |
1219 @@ -1025,17 +1025,17 @@ nsresult nsOSHelperAppService::GetHandle |
1218 #include "nsIFile.h" |
|
1219 @@ -1024,17 +1024,17 @@ nsresult nsOSHelperAppService::GetHandle |
1220 |
1220 |
1221 nsresult nsOSHelperAppService::OSProtocolHandlerExists( |
1221 nsresult nsOSHelperAppService::OSProtocolHandlerExists( |
1222 const char* aProtocolScheme, bool* aHandlerExists) { |
1222 const char* aProtocolScheme, bool* aHandlerExists) { |
1223 nsresult rv = NS_OK; |
1223 nsresult rv = NS_OK; |
1224 |
1224 |
1233 } else { |
1233 } else { |
1234 *aHandlerExists = false; |
1234 *aHandlerExists = false; |
1235 nsCOMPtr<nsIHandlerService> handlerSvc = |
1235 nsCOMPtr<nsIHandlerService> handlerSvc = |
1236 do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv); |
1236 do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv); |
1237 if (NS_SUCCEEDED(rv) && handlerSvc) { |
1237 if (NS_SUCCEEDED(rv) && handlerSvc) { |
1238 @@ -1045,17 +1045,17 @@ nsresult nsOSHelperAppService::OSProtoco |
1238 @@ -1044,17 +1044,17 @@ nsresult nsOSHelperAppService::OSProtoco |
1239 } |
1239 } |
1240 |
1240 |
1241 return rv; |
1241 return rv; |
1242 } |
1242 } |
1243 |
1243 |
1252 #endif |
1252 #endif |
1253 } |
1253 } |
1254 |
1254 |
1255 NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol( |
1255 NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol( |
1256 const nsACString& aScheme, bool* _retval) { |
1256 const nsACString& aScheme, bool* _retval) { |
1257 @@ -1142,17 +1142,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1257 @@ -1141,17 +1141,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1258 nsresult rv = |
1258 nsresult rv = |
1259 LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1259 LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1260 minorType, mime_types_description, true); |
1260 minorType, mime_types_description, true); |
1261 |
1261 |
1262 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
1262 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
1271 } |
1271 } |
1272 #endif |
1272 #endif |
1273 |
1273 |
1274 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1274 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1275 minorType, mime_types_description, false); |
1275 minorType, mime_types_description, false); |
1276 @@ -1254,17 +1254,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1276 @@ -1253,17 +1253,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1277 |
1277 |
1278 // Now look up our extensions |
1278 // Now look up our extensions |
1279 nsAutoString extensions, mime_types_description; |
1279 nsAutoString extensions, mime_types_description; |
1280 LookUpExtensionsAndDescription(majorType, minorType, extensions, |
1280 LookUpExtensionsAndDescription(majorType, minorType, extensions, |
1281 mime_types_description); |
1281 mime_types_description); |
1293 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1293 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1294 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1294 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1295 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1295 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1296 --- a/widget/gtk/moz.build |
1296 --- a/widget/gtk/moz.build |
1297 +++ b/widget/gtk/moz.build |
1297 +++ b/widget/gtk/moz.build |
1298 @@ -127,16 +127,17 @@ include('/ipc/chromium/chromium-config.m |
1298 @@ -128,16 +128,17 @@ include('/ipc/chromium/chromium-config.m |
1299 |
1299 |
1300 FINAL_LIBRARY = 'xul' |
1300 FINAL_LIBRARY = 'xul' |
1301 |
1301 |
1302 LOCAL_INCLUDES += [ |
1302 LOCAL_INCLUDES += [ |
1303 '/layout/base', |
1303 '/layout/base', |
1314 '/widget/x11', |
1314 '/widget/x11', |
1315 ] |
1315 ] |
1316 diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp |
1316 diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp |
1317 --- a/widget/gtk/nsFilePicker.cpp |
1317 --- a/widget/gtk/nsFilePicker.cpp |
1318 +++ b/widget/gtk/nsFilePicker.cpp |
1318 +++ b/widget/gtk/nsFilePicker.cpp |
1319 @@ -4,16 +4,17 @@ |
1319 @@ -1,15 +1,16 @@ |
|
1320 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
|
1321 /* This Source Code Form is subject to the terms of the Mozilla Public |
|
1322 * License, v. 2.0. If a copy of the MPL was not distributed with this |
1320 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
1323 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
1321 |
1324 |
1322 #include "mozilla/Types.h" |
1325 #include <dlfcn.h> |
|
1326 #include <gtk/gtk.h> |
|
1327 +#include <gdk/gdkx.h> |
1323 #include <sys/types.h> |
1328 #include <sys/types.h> |
1324 #include <sys/stat.h> |
1329 #include <sys/stat.h> |
1325 #include <unistd.h> |
1330 #include <unistd.h> |
1326 |
1331 |
1327 #include <gtk/gtk.h> |
1332 #include "mozilla/Types.h" |
1328 +#include <gdk/gdkx.h> |
|
1329 |
|
1330 #include "nsGtkUtils.h" |
1333 #include "nsGtkUtils.h" |
1331 #include "nsIFileURL.h" |
1334 #include "nsIFileURL.h" |
1332 #include "nsIGIOService.h" |
1335 #include "nsIGIOService.h" |
1333 #include "nsIURI.h" |
1336 @@ -20,16 +21,17 @@ |
1334 #include "nsIWidget.h" |
|
1335 #include "nsIFile.h" |
|
1336 #include "nsIStringBundle.h" |
|
1337 @@ -21,16 +22,17 @@ |
|
1338 #include "nsArrayEnumerator.h" |
1337 #include "nsArrayEnumerator.h" |
1339 #include "nsMemory.h" |
1338 #include "nsMemory.h" |
1340 #include "nsEnumeratorUtils.h" |
1339 #include "nsEnumeratorUtils.h" |
1341 #include "nsNetUtil.h" |
1340 #include "nsNetUtil.h" |
1342 #include "nsReadableUtils.h" |
1341 #include "nsReadableUtils.h" |
1350 #define MAX_PREVIEW_SIZE 180 |
1349 #define MAX_PREVIEW_SIZE 180 |
1351 // bug 1184009 |
1350 // bug 1184009 |
1352 #define MAX_PREVIEW_SOURCE_SIZE 4096 |
1351 #define MAX_PREVIEW_SOURCE_SIZE 4096 |
1353 |
1352 |
1354 nsIFile* nsFilePicker::mPrevDisplayDirectory = nullptr; |
1353 nsIFile* nsFilePicker::mPrevDisplayDirectory = nullptr; |
1355 @@ -228,17 +230,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
1354 @@ -227,17 +229,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
1356 mAllowURLs = !!(aFilterMask & filterAllowURLs); |
1355 mAllowURLs = !!(aFilterMask & filterAllowURLs); |
1357 return nsBaseFilePicker::AppendFilters(aFilterMask); |
1356 return nsBaseFilePicker::AppendFilters(aFilterMask); |
1358 } |
1357 } |
1359 |
1358 |
1360 NS_IMETHODIMP |
1359 NS_IMETHODIMP |
1371 CopyUTF16toUTF8(aFilter, filter); |
1370 CopyUTF16toUTF8(aFilter, filter); |
1372 CopyUTF16toUTF8(aTitle, name); |
1371 CopyUTF16toUTF8(aTitle, name); |
1373 |
1372 |
1374 mFilters.AppendElement(filter); |
1373 mFilters.AppendElement(filter); |
1375 mFilterNames.AppendElement(name); |
1374 mFilterNames.AppendElement(name); |
1376 @@ -338,16 +342,39 @@ nsresult nsFilePicker::Show(int16_t* aRe |
1375 @@ -337,16 +341,39 @@ nsresult nsFilePicker::Show(int16_t* aRe |
1377 return NS_OK; |
1376 return NS_OK; |
1378 } |
1377 } |
1379 |
1378 |
1380 NS_IMETHODIMP |
1379 NS_IMETHODIMP |
1381 nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) { |
1380 nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) { |
1411 GtkWindow* parent_widget = |
1410 GtkWindow* parent_widget = |
1412 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
1411 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
1413 |
1412 |
1414 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
1413 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
1415 |
1414 |
1416 @@ -573,16 +600,240 @@ void nsFilePicker::Done(void* file_choos |
1415 @@ -572,16 +599,240 @@ void nsFilePicker::Done(void* file_choos |
1417 mCallback->Done(result); |
1416 mCallback->Done(result); |
1418 mCallback = nullptr; |
1417 mCallback = nullptr; |
1419 } else { |
1418 } else { |
1420 mResult = result; |
1419 mResult = result; |
1421 } |
1420 } |
1833 DEFINES['MOZ_LAYOUT_DEBUGGER'] = True |
1832 DEFINES['MOZ_LAYOUT_DEBUGGER'] = True |
1834 |
1833 |
1835 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1834 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1836 --- a/xpcom/io/nsLocalFileUnix.cpp |
1835 --- a/xpcom/io/nsLocalFileUnix.cpp |
1837 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1836 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1838 @@ -47,16 +47,17 @@ |
1837 @@ -46,16 +46,17 @@ |
1839 #include "prproces.h" |
1838 #include "prproces.h" |
1840 #include "nsIDirectoryEnumerator.h" |
1839 #include "nsIDirectoryEnumerator.h" |
1841 #include "nsSimpleEnumerator.h" |
1840 #include "nsSimpleEnumerator.h" |
1842 #include "private/pprio.h" |
1841 #include "private/pprio.h" |
1843 #include "prlink.h" |
1842 #include "prlink.h" |
1851 # include <Carbon/Carbon.h> |
1850 # include <Carbon/Carbon.h> |
1852 # include "CocoaFileUtils.h" |
1851 # include "CocoaFileUtils.h" |
1853 # include "prmem.h" |
1852 # include "prmem.h" |
1854 # include "plbase64.h" |
1853 # include "plbase64.h" |
1855 |
1854 |
1856 @@ -1902,62 +1903,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1855 @@ -1904,62 +1905,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1857 |
1856 |
1858 NS_IMETHODIMP |
1857 NS_IMETHODIMP |
1859 nsLocalFile::Reveal() { |
1858 nsLocalFile::Reveal() { |
1860 if (!FilePreferences::IsAllowedPath(mPath)) { |
1859 if (!FilePreferences::IsAllowedPath(mPath)) { |
1861 return NS_ERROR_FILE_ACCESS_DENIED; |
1860 return NS_ERROR_FILE_ACCESS_DENIED; |