1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 3f3d1e5db92a45cf3758ee5ba77c577fcfb364c9 |
2 # Parent 21f164ba2522a31ab9cfb4766acff17526183f8e |
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 |
26 libs:: greprefs.js |
26 libs:: greprefs.js |
27 $(INSTALL) $^ $(DIST)/bin/ |
27 $(INSTALL) $^ $(DIST)/bin/ |
28 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
28 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
29 --- a/modules/libpref/Preferences.cpp |
29 --- a/modules/libpref/Preferences.cpp |
30 +++ b/modules/libpref/Preferences.cpp |
30 +++ b/modules/libpref/Preferences.cpp |
31 @@ -27,16 +27,17 @@ |
31 @@ -30,16 +30,17 @@ |
32 #include "nsIZipReader.h" |
32 #include "nsIZipReader.h" |
33 #include "nsPrefBranch.h" |
33 #include "nsPrefBranch.h" |
34 #include "nsXPIDLString.h" |
34 #include "nsXPIDLString.h" |
35 #include "nsCRT.h" |
35 #include "nsCRT.h" |
36 #include "nsCOMArray.h" |
36 #include "nsCOMArray.h" |
44 |
44 |
45 #include "prefapi.h" |
45 #include "prefapi.h" |
46 #include "prefread.h" |
46 #include "prefread.h" |
47 #include "prefapi_private_data.h" |
47 #include "prefapi_private_data.h" |
48 |
48 |
49 @@ -1153,16 +1154,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
49 @@ -1148,16 +1149,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
50 |
50 |
51 static nsresult pref_LoadPrefsInDirList(const char *listId) |
51 static nsresult pref_LoadPrefsInDirList(const char *listId) |
52 { |
52 { |
53 nsresult rv; |
53 nsresult rv; |
54 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
54 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
79 getter_AddRefs(list)); |
79 getter_AddRefs(list)); |
80 if (!list) |
80 if (!list) |
81 return NS_OK; |
81 return NS_OK; |
82 |
82 |
83 bool hasMore; |
83 bool hasMore; |
84 @@ -1178,17 +1197,17 @@ static nsresult pref_LoadPrefsInDirList( |
84 @@ -1173,17 +1192,17 @@ static nsresult pref_LoadPrefsInDirList( |
85 |
85 |
86 nsAutoCString leaf; |
86 nsAutoCString leaf; |
87 path->GetNativeLeafName(leaf); |
87 path->GetNativeLeafName(leaf); |
88 |
88 |
89 // Do we care if a file provided by this process fails to load? |
89 // Do we care if a file provided by this process fails to load? |
98 |
98 |
99 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
99 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
100 { |
100 { |
101 nsZipItemPtr<char> manifest(jarReader, name, true); |
101 nsZipItemPtr<char> manifest(jarReader, name, true); |
102 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
102 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
103 @@ -1282,26 +1301,38 @@ static nsresult pref_InitInitialObjects( |
103 @@ -1277,26 +1296,38 @@ static nsresult pref_InitInitialObjects( |
104 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
104 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
105 static const char* specialFiles[] = { |
105 static const char* specialFiles[] = { |
106 #if defined(XP_MACOSX) |
106 #if defined(XP_MACOSX) |
107 "macprefs.js" |
107 "macprefs.js" |
108 #elif defined(XP_WIN) |
108 #elif defined(XP_WIN) |
203 |
203 |
204 CXXFLAGS += CONFIG['TK_CFLAGS'] |
204 CXXFLAGS += CONFIG['TK_CFLAGS'] |
205 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
205 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
206 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
206 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
207 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
207 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
208 @@ -46,16 +46,20 @@ |
208 @@ -51,16 +51,20 @@ |
209 #ifdef XP_WIN |
209 #ifdef XP_WIN |
210 #include <shlobj.h> |
210 #include <shlobj.h> |
211 #include "nsWindowsHelpers.h" |
211 #include "nsWindowsHelpers.h" |
212 #ifdef DOWNLOAD_SCANNER |
212 #ifdef DOWNLOAD_SCANNER |
213 #include "nsDownloadScanner.h" |
213 #include "nsDownloadScanner.h" |
224 |
224 |
225 #ifdef MOZ_WIDGET_ANDROID |
225 #ifdef MOZ_WIDGET_ANDROID |
226 #include "AndroidBridge.h" |
226 #include "AndroidBridge.h" |
227 #endif |
227 #endif |
228 |
228 |
229 @@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat |
229 @@ -2714,16 +2718,25 @@ nsDownload::SetState(DownloadState aStat |
230 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
230 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
231 |
231 |
232 // Master pref to control this function. |
232 // Master pref to control this function. |
233 bool showTaskbarAlert = true; |
233 bool showTaskbarAlert = true; |
234 if (pref) |
234 if (pref) |
250 |
250 |
251 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
251 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
252 int64_t goat = PR_Now() - mStartTime; |
252 int64_t goat = PR_Now() - mStartTime; |
253 showTaskbarAlert = goat > alertIntervalUSec; |
253 showTaskbarAlert = goat > alertIntervalUSec; |
254 |
254 |
255 @@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat |
255 @@ -2754,16 +2767,17 @@ nsDownload::SetState(DownloadState aStat |
256 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
256 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
257 message, !removeWhenDone, |
257 message, !removeWhenDone, |
258 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
258 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
259 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), |
259 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), |
260 EmptyString(), EmptyString(), nullptr, mPrivate); |
260 EmptyString(), EmptyString(), nullptr, mPrivate); |
2181 +# PrefWindow I (June 4, 1999) |
2181 +# PrefWindow I (June 4, 1999) |
2182 +# |
2182 +# |
2183 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2183 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2184 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2184 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2185 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2185 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2186 @@ -14,16 +14,17 @@ |
2186 @@ -15,16 +15,17 @@ |
2187 #include "prenv.h" |
|
2188 #include "nsPrintfCString.h" |
2187 #include "nsPrintfCString.h" |
|
2188 #include "nsNetCID.h" |
2189 #include "nsNetUtil.h" |
2189 #include "nsNetUtil.h" |
2190 #include "nsISupportsPrimitives.h" |
2190 #include "nsISupportsPrimitives.h" |
2191 #include "nsIGSettingsService.h" |
2191 #include "nsIGSettingsService.h" |
2192 #include "nsInterfaceHashtable.h" |
2192 #include "nsInterfaceHashtable.h" |
2193 #include "mozilla/Attributes.h" |
2193 #include "mozilla/Attributes.h" |
2199 NS_DECL_ISUPPORTS |
2199 NS_DECL_ISUPPORTS |
2200 NS_DECL_NSISYSTEMPROXYSETTINGS |
2200 NS_DECL_NSISYSTEMPROXYSETTINGS |
2201 |
2201 |
2202 nsUnixSystemProxySettings() |
2202 nsUnixSystemProxySettings() |
2203 : mSchemeProxySettings(4) |
2203 : mSchemeProxySettings(4) |
2204 @@ -38,16 +39,17 @@ private: |
2204 @@ -39,16 +40,17 @@ private: |
2205 nsCOMPtr<nsIGSettingsService> mGSettings; |
2205 nsCOMPtr<nsIGSettingsService> mGSettings; |
2206 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
2206 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
2207 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; |
2207 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; |
2208 bool IsProxyMode(const char* aMode); |
2208 bool IsProxyMode(const char* aMode); |
2209 nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); |
2209 nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); |
2217 |
2217 |
2218 NS_IMETHODIMP |
2218 NS_IMETHODIMP |
2219 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) |
2219 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) |
2220 { |
2220 { |
2221 // dbus prevents us from being threadsafe, but this routine should not block anyhow |
2221 // dbus prevents us from being threadsafe, but this routine should not block anyhow |
2222 @@ -504,16 +506,19 @@ nsUnixSystemProxySettings::GetProxyFromG |
2222 @@ -505,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG |
2223 |
2223 |
2224 nsresult |
2224 nsresult |
2225 nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, |
2225 nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, |
2226 const nsACString & aScheme, |
2226 const nsACString & aScheme, |
2227 const nsACString & aHost, |
2227 const nsACString & aHost, |
2237 return rv; |
2237 return rv; |
2238 } |
2238 } |
2239 if (mGConf) |
2239 if (mGConf) |
2240 return GetProxyFromGConf(aScheme, aHost, aPort, aResult); |
2240 return GetProxyFromGConf(aScheme, aHost, aPort, aResult); |
2241 |
2241 |
2242 @@ -539,8 +544,34 @@ static const mozilla::Module::ContractID |
2242 @@ -540,8 +545,34 @@ static const mozilla::Module::ContractID |
2243 |
2243 |
2244 static const mozilla::Module kUnixProxyModule = { |
2244 static const mozilla::Module kUnixProxyModule = { |
2245 mozilla::Module::kVersion, |
2245 mozilla::Module::kVersion, |
2246 kUnixProxyCIDs, |
2246 kUnixProxyCIDs, |
2247 kUnixProxyContracts |
2247 kUnixProxyContracts |
2275 +} |
2275 +} |
2276 + |
2276 + |
2277 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
2277 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
2278 --- a/toolkit/xre/moz.build |
2278 --- a/toolkit/xre/moz.build |
2279 +++ b/toolkit/xre/moz.build |
2279 +++ b/toolkit/xre/moz.build |
2280 @@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
2280 @@ -48,17 +48,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui |
2281 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': |
2281 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': |
2282 EXPORTS += ['nsQAppInstance.h'] |
2282 EXPORTS += ['nsQAppInstance.h'] |
2283 SOURCES += [ |
2283 SOURCES += [ |
2284 '!moc_nsNativeAppSupportQt.cpp', |
2284 '!moc_nsNativeAppSupportQt.cpp', |
2285 'nsNativeAppSupportQt.cpp', |
2285 'nsNativeAppSupportQt.cpp', |