equal
deleted
inserted
replaced
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 c8bc6be5267f16016d506973a2d6a7c58a1cd441 |
6 # Parent 0dd1b6436342922d434e7c818875b2a02a73b5ed |
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 |
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 @@ -4635,25 +4636,37 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4634,16 +4635,27 @@ nsresult Preferences::InitInitialObjects |
35 // application pref files for backwards compatibility. |
|
36 static const char* specialFiles[] = { |
|
37 #if defined(XP_MACOSX) |
|
38 "macprefs.js" |
|
39 #elif defined(XP_WIN) |
|
40 "winpref.js" |
|
41 #elif defined(XP_UNIX) |
|
42 "unix.js" |
35 "unix.js" |
43 + , "" // placeholder for KDE (empty is otherwise harmless) |
|
44 # if defined(_AIX) |
36 # if defined(_AIX) |
45 , |
37 , |
46 "aix.js" |
38 "aix.js" |
47 # endif |
39 # endif |
48 #elif defined(XP_BEOS) |
|
49 "beos.js" |
|
50 #endif |
40 #endif |
51 }; |
41 }; |
52 |
42 |
53 + if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? |
43 + if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? |
54 + for(int i = 0; |
44 + for(int i = 0; |
67 NS_WARNING("Error parsing application default preferences."); |
57 NS_WARNING("Error parsing application default preferences."); |
68 } |
58 } |
69 |
59 |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
60 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
61 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
72 @@ -4718,17 +4731,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4708,17 +4720,17 @@ nsresult Preferences::InitInitialObjects |
73 } |
63 } |
74 |
64 |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
65 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
76 if (!path) { |
66 if (!path) { |
77 continue; |
67 continue; |
89 |
79 |
90 if (aIsStartup) { |
80 if (aIsStartup) { |
91 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
81 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
92 --- a/modules/libpref/moz.build |
82 --- a/modules/libpref/moz.build |
93 +++ b/modules/libpref/moz.build |
83 +++ b/modules/libpref/moz.build |
94 @@ -117,16 +117,20 @@ EXPORTS.mozilla += [ |
84 @@ -118,16 +118,20 @@ EXPORTS.mozilla += [ |
95 ] |
85 ] |
96 EXPORTS.mozilla += sorted(["!" + g for g in gen_h]) |
86 EXPORTS.mozilla += sorted(["!" + g for g in gen_h]) |
97 |
87 |
98 UNIFIED_SOURCES += [ |
88 UNIFIED_SOURCES += [ |
99 "Preferences.cpp", |
89 "Preferences.cpp", |
354 return result.forget().downcast<nsISupports>(); |
344 return result.forget().downcast<nsISupports>(); |
355 } |
345 } |
356 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
346 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
357 --- a/toolkit/xre/moz.build |
347 --- a/toolkit/xre/moz.build |
358 +++ b/toolkit/xre/moz.build |
348 +++ b/toolkit/xre/moz.build |
359 @@ -93,17 +93,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co |
349 @@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co |
360 "../components/printingui", |
350 "../components/printingui", |
361 ] |
351 ] |
362 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit": |
352 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit": |
363 UNIFIED_SOURCES += [ |
353 UNIFIED_SOURCES += [ |
364 "nsNativeAppSupportDefault.cpp", |
354 "nsNativeAppSupportDefault.cpp", |
1212 # endif |
1202 # endif |
1213 #endif |
1203 #endif |
1214 #include "nsISupports.h" |
1204 #include "nsISupports.h" |
1215 #include "nsString.h" |
1205 #include "nsString.h" |
1216 #include "nsReadableUtils.h" |
1206 #include "nsReadableUtils.h" |
1217 @@ -1024,17 +1024,17 @@ nsresult nsOSHelperAppService::GetHandle |
1207 @@ -1025,17 +1025,17 @@ nsresult nsOSHelperAppService::GetHandle |
1218 |
1208 |
1219 nsresult nsOSHelperAppService::OSProtocolHandlerExists( |
1209 nsresult nsOSHelperAppService::OSProtocolHandlerExists( |
1220 const char* aProtocolScheme, bool* aHandlerExists) { |
1210 const char* aProtocolScheme, bool* aHandlerExists) { |
1221 nsresult rv = NS_OK; |
1211 nsresult rv = NS_OK; |
1222 |
1212 |
1231 } else { |
1221 } else { |
1232 *aHandlerExists = false; |
1222 *aHandlerExists = false; |
1233 nsCOMPtr<nsIHandlerService> handlerSvc = |
1223 nsCOMPtr<nsIHandlerService> handlerSvc = |
1234 do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv); |
1224 do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv); |
1235 if (NS_SUCCEEDED(rv) && handlerSvc) { |
1225 if (NS_SUCCEEDED(rv) && handlerSvc) { |
1236 @@ -1044,17 +1044,17 @@ nsresult nsOSHelperAppService::OSProtoco |
1226 @@ -1045,17 +1045,17 @@ nsresult nsOSHelperAppService::OSProtoco |
1237 } |
1227 } |
1238 |
1228 |
1239 return rv; |
1229 return rv; |
1240 } |
1230 } |
1241 |
1231 |
1250 #endif |
1240 #endif |
1251 } |
1241 } |
1252 |
1242 |
1253 NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol( |
1243 NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol( |
1254 const nsACString& aScheme, bool* _retval) { |
1244 const nsACString& aScheme, bool* _retval) { |
1255 @@ -1147,17 +1147,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1245 @@ -1148,17 +1148,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1256 nsresult rv = |
1246 nsresult rv = |
1257 LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1247 LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1258 minorType, mime_types_description, true); |
1248 minorType, mime_types_description, true); |
1259 |
1249 |
1260 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
1250 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
1269 } |
1259 } |
1270 #endif |
1260 #endif |
1271 |
1261 |
1272 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1262 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1273 minorType, mime_types_description, false); |
1263 minorType, mime_types_description, false); |
1274 @@ -1258,17 +1258,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1264 @@ -1261,17 +1261,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1275 |
1265 |
1276 // Now look up our extensions |
1266 // Now look up our extensions |
1277 nsAutoString extensions, mime_types_description; |
1267 nsAutoString extensions, mime_types_description; |
1278 LookUpExtensionsAndDescription(majorType, minorType, extensions, |
1268 LookUpExtensionsAndDescription(majorType, minorType, extensions, |
1279 mime_types_description); |
1269 mime_types_description); |
1291 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1281 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1292 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1282 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1293 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1283 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1294 --- a/widget/gtk/moz.build |
1284 --- a/widget/gtk/moz.build |
1295 +++ b/widget/gtk/moz.build |
1285 +++ b/widget/gtk/moz.build |
1296 @@ -136,16 +136,17 @@ FINAL_LIBRARY = "xul" |
1286 @@ -137,16 +137,17 @@ FINAL_LIBRARY = "xul" |
1297 |
1287 |
1298 LOCAL_INCLUDES += [ |
1288 LOCAL_INCLUDES += [ |
1299 "/layout/base", |
1289 "/layout/base", |
1300 "/layout/forms", |
1290 "/layout/forms", |
1301 "/layout/generic", |
1291 "/layout/generic", |
1853 # include <Carbon/Carbon.h> |
1843 # include <Carbon/Carbon.h> |
1854 # include "CocoaFileUtils.h" |
1844 # include "CocoaFileUtils.h" |
1855 # include "prmem.h" |
1845 # include "prmem.h" |
1856 # include "plbase64.h" |
1846 # include "plbase64.h" |
1857 |
1847 |
1858 @@ -2021,62 +2022,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1848 @@ -2023,62 +2024,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1859 |
1849 |
1860 NS_IMETHODIMP |
1850 NS_IMETHODIMP |
1861 nsLocalFile::Reveal() { |
1851 nsLocalFile::Reveal() { |
1862 if (!FilePreferences::IsAllowedPath(mPath)) { |
1852 if (!FilePreferences::IsAllowedPath(mPath)) { |
1863 return NS_ERROR_FILE_ACCESS_DENIED; |
1853 return NS_ERROR_FILE_ACCESS_DENIED; |