1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent a930d4c1c3fba77f61071becdc51e3232e0b72ca |
2 # Parent c5bcac47a3f81790e9c2724d9d17ea5a7f20e735 |
3 Description: Add KDE integration to Firefox (toolkit parts) |
3 Description: Add KDE integration to Firefox (toolkit parts) |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
5 Author: Lubos Lunak <lunak@suse.com> |
5 Author: Lubos Lunak <lunak@suse.com> |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
8 |
8 |
9 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
9 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
10 --- a/modules/libpref/Preferences.cpp |
10 --- a/modules/libpref/Preferences.cpp |
11 +++ b/modules/libpref/Preferences.cpp |
11 +++ b/modules/libpref/Preferences.cpp |
12 @@ -33,16 +33,17 @@ |
12 @@ -37,16 +37,17 @@ |
13 #include "nsIZipReader.h" |
13 #include "nsIZipReader.h" |
14 #include "nsPrefBranch.h" |
14 #include "nsPrefBranch.h" |
15 #include "nsXPIDLString.h" |
15 #include "nsString.h" |
16 #include "nsCRT.h" |
16 #include "nsCRT.h" |
17 #include "nsCOMArray.h" |
17 #include "nsCOMArray.h" |
18 #include "nsXPCOMCID.h" |
18 #include "nsXPCOMCID.h" |
19 #include "nsAutoPtr.h" |
19 #include "nsAutoPtr.h" |
20 #include "nsPrintfCString.h" |
20 #include "nsPrintfCString.h" |
25 |
25 |
26 #include "prefapi.h" |
26 #include "prefapi.h" |
27 #include "prefread.h" |
27 #include "prefread.h" |
28 #include "prefapi_private_data.h" |
28 #include "prefapi_private_data.h" |
29 |
29 |
30 @@ -1435,16 +1436,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
30 @@ -1413,16 +1414,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
31 |
31 |
32 static nsresult pref_LoadPrefsInDirList(const char *listId) |
32 static nsresult pref_LoadPrefsInDirList(const char *listId) |
33 { |
33 { |
34 nsresult rv; |
34 nsresult rv; |
35 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
35 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
60 getter_AddRefs(list)); |
60 getter_AddRefs(list)); |
61 if (!list) |
61 if (!list) |
62 return NS_OK; |
62 return NS_OK; |
63 |
63 |
64 bool hasMore; |
64 bool hasMore; |
65 @@ -1460,17 +1479,17 @@ static nsresult pref_LoadPrefsInDirList( |
65 @@ -1438,17 +1457,17 @@ static nsresult pref_LoadPrefsInDirList( |
66 |
66 |
67 nsAutoCString leaf; |
67 nsAutoCString leaf; |
68 path->GetNativeLeafName(leaf); |
68 path->GetNativeLeafName(leaf); |
69 |
69 |
70 // Do we care if a file provided by this process fails to load? |
70 // Do we care if a file provided by this process fails to load? |
77 return NS_OK; |
77 return NS_OK; |
78 } |
78 } |
79 |
79 |
80 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
80 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
81 { |
81 { |
82 nsZipItemPtr<char> manifest(jarReader, name, true); |
82 nsCString manifest; |
83 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
83 MOZ_TRY_VAR(manifest, URLPreloader::ReadZip(jarReader, nsDependentCString(name))); |
84 @@ -1566,24 +1585,36 @@ pref_InitInitialObjects() |
84 @@ -1544,24 +1563,36 @@ pref_InitInitialObjects() |
85 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
85 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
86 static const char* specialFiles[] = { |
86 static const char* specialFiles[] = { |
87 #if defined(XP_MACOSX) |
87 #if defined(XP_MACOSX) |
88 "macprefs.js" |
88 "macprefs.js" |
89 #elif defined(XP_WIN) |
89 #elif defined(XP_WIN) |
119 RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
119 RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
120 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
120 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
121 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
121 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
122 --- a/modules/libpref/moz.build |
122 --- a/modules/libpref/moz.build |
123 +++ b/modules/libpref/moz.build |
123 +++ b/modules/libpref/moz.build |
124 @@ -33,16 +33,20 @@ EXPORTS.mozilla += [ |
124 @@ -31,16 +31,20 @@ EXPORTS.mozilla += [ |
125 UNIFIED_SOURCES += [ |
125 UNIFIED_SOURCES += [ |
126 'nsPrefBranch.cpp', |
126 'nsPrefBranch.cpp', |
127 'nsPrefsFactory.cpp', |
127 'nsPrefsFactory.cpp', |
128 'prefapi.cpp', |
128 'prefapi.cpp', |
129 'Preferences.cpp', |
129 'Preferences.cpp', |
164 flags = Flags('contentaccessible=yes', 'appversion>=3.5') |
164 flags = Flags('contentaccessible=yes', 'appversion>=3.5') |
165 ''' |
165 ''' |
166 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py |
166 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py |
167 --- a/python/mozbuild/mozpack/chrome/manifest.py |
167 --- a/python/mozbuild/mozpack/chrome/manifest.py |
168 +++ b/python/mozbuild/mozpack/chrome/manifest.py |
168 +++ b/python/mozbuild/mozpack/chrome/manifest.py |
169 @@ -33,16 +33,17 @@ class ManifestEntry(object): |
169 @@ -34,16 +34,17 @@ class ManifestEntry(object): |
170 'application', |
|
171 'platformversion', |
170 'platformversion', |
172 'os', |
171 'os', |
173 'osversion', |
172 'osversion', |
174 'abi', |
173 'abi', |
175 'xpcnativewrappers', |
174 'xpcnativewrappers', |
176 'tablet', |
175 'tablet', |
177 'process', |
176 'process', |
178 + 'desktop', |
177 'contentaccessible', |
|
178 + 'desktop', |
179 ] |
179 ] |
180 |
180 |
181 def __init__(self, base, *flags): |
181 def __init__(self, base, *flags): |
182 ''' |
182 ''' |
183 Initialize a manifest entry with the given base path and flags. |
183 Initialize a manifest entry with the given base path and flags. |
3124 #endif |
3124 #endif |
3125 #include "nsISupports.h" |
3125 #include "nsISupports.h" |
3126 #include "nsString.h" |
3126 #include "nsString.h" |
3127 #include "nsReadableUtils.h" |
3127 #include "nsReadableUtils.h" |
3128 #include "nsUnicharUtils.h" |
3128 #include "nsUnicharUtils.h" |
3129 #include "nsXPIDLString.h" |
|
3130 #include "nsIURL.h" |
3129 #include "nsIURL.h" |
3131 #include "nsIFileStreams.h" |
3130 #include "nsIFileStreams.h" |
3132 @@ -1143,26 +1143,26 @@ nsresult nsOSHelperAppService::OSProtoco |
3131 #include "nsILineInputStream.h" |
|
3132 @@ -1142,26 +1142,26 @@ nsresult nsOSHelperAppService::OSProtoco |
3133 ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); |
3133 ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); |
3134 |
3134 |
3135 if (action.isValid()) |
3135 if (action.isValid()) |
3136 *aHandlerExists = true; |
3136 *aHandlerExists = true; |
3137 #endif |
3137 #endif |
3156 #endif |
3156 #endif |
3157 } |
3157 } |
3158 |
3158 |
3159 nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile) |
3159 nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile) |
3160 { |
3160 { |
3161 @@ -1249,17 +1249,17 @@ nsOSHelperAppService::GetFromExtension(c |
3161 @@ -1248,17 +1248,17 @@ nsOSHelperAppService::GetFromExtension(c |
3162 mime_types_description, |
3162 mime_types_description, |
3163 true); |
3163 true); |
3164 |
3164 |
3165 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
3165 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
3166 |
3166 |
3175 } |
3175 } |
3176 #endif |
3176 #endif |
3177 |
3177 |
3178 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), |
3178 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), |
3179 majorType, |
3179 majorType, |
3180 @@ -1370,17 +1370,17 @@ nsOSHelperAppService::GetFromType(const |
3180 @@ -1369,17 +1369,17 @@ nsOSHelperAppService::GetFromType(const |
3181 nsAutoString extensions, mime_types_description; |
3181 nsAutoString extensions, mime_types_description; |
3182 LookUpExtensionsAndDescription(majorType, |
3182 LookUpExtensionsAndDescription(majorType, |
3183 minorType, |
3183 minorType, |
3184 extensions, |
3184 extensions, |
3185 mime_types_description); |
3185 mime_types_description); |
3725 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
3725 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
3726 CXXFLAGS += CONFIG['TK_CFLAGS'] |
3726 CXXFLAGS += CONFIG['TK_CFLAGS'] |
3727 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3727 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3728 --- a/xpcom/io/nsLocalFileUnix.cpp |
3728 --- a/xpcom/io/nsLocalFileUnix.cpp |
3729 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3729 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3730 @@ -46,16 +46,17 @@ |
3730 @@ -45,16 +45,17 @@ |
3731 #include "prproces.h" |
3731 #include "prproces.h" |
3732 #include "nsIDirectoryEnumerator.h" |
3732 #include "nsIDirectoryEnumerator.h" |
3733 #include "nsISimpleEnumerator.h" |
3733 #include "nsISimpleEnumerator.h" |
3734 #include "private/pprio.h" |
3734 #include "private/pprio.h" |
3735 #include "prlink.h" |
3735 #include "prlink.h" |
3743 #include <Carbon/Carbon.h> |
3743 #include <Carbon/Carbon.h> |
3744 #include "CocoaFileUtils.h" |
3744 #include "CocoaFileUtils.h" |
3745 #include "prmem.h" |
3745 #include "prmem.h" |
3746 #include "plbase64.h" |
3746 #include "plbase64.h" |
3747 |
3747 |
3748 @@ -1941,59 +1942,74 @@ nsLocalFile::SetPersistentDescriptor(con |
3748 @@ -1938,59 +1939,74 @@ nsLocalFile::SetPersistentDescriptor(con |
3749 return InitWithNativePath(aPersistentDescriptor); |
3749 return InitWithNativePath(aPersistentDescriptor); |
3750 #endif |
3750 #endif |
3751 } |
3751 } |
3752 |
3752 |
3753 NS_IMETHODIMP |
3753 NS_IMETHODIMP |