1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent d9c9ae52f0338a60d1626d9209248341815e597a |
2 # Parent 797d5f17b080f54439602f107ecaf6b09a0ef5c1 |
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/Makefile.in b/modules/libpref/Makefile.in |
|
10 --- a/modules/libpref/Makefile.in |
|
11 +++ b/modules/libpref/Makefile.in |
|
12 @@ -21,13 +21,15 @@ endif |
|
13 ifdef MOZ_SERVICES_HEALTHREPORT |
|
14 ifneq (android,$(MOZ_WIDGET_TOOLKIT)) |
|
15 grepref_files += $(topsrcdir)/services/healthreport/healthreport-prefs.js |
|
16 else |
|
17 grepref_files += $(topsrcdir)/mobile/android/chrome/content/healthreport-prefs.js |
|
18 endif |
|
19 endif |
|
20 |
|
21 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
|
22 + |
|
23 greprefs.js: $(grepref_files) |
|
24 $(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) $^ -o $@) |
|
25 |
|
26 libs:: greprefs.js |
|
27 $(INSTALL) $^ $(DIST)/bin/ |
|
28 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 |
29 --- a/modules/libpref/Preferences.cpp |
10 --- a/modules/libpref/Preferences.cpp |
30 +++ b/modules/libpref/Preferences.cpp |
11 +++ b/modules/libpref/Preferences.cpp |
31 @@ -30,16 +30,17 @@ |
12 @@ -30,16 +30,17 @@ |
32 #include "nsIZipReader.h" |
13 #include "nsIZipReader.h" |
44 |
25 |
45 #include "prefapi.h" |
26 #include "prefapi.h" |
46 #include "prefread.h" |
27 #include "prefread.h" |
47 #include "prefapi_private_data.h" |
28 #include "prefapi_private_data.h" |
48 |
29 |
49 @@ -1148,16 +1149,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
30 @@ -1136,16 +1137,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
50 |
31 |
51 static nsresult pref_LoadPrefsInDirList(const char *listId) |
32 static nsresult pref_LoadPrefsInDirList(const char *listId) |
52 { |
33 { |
53 nsresult rv; |
34 nsresult rv; |
54 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
35 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
79 getter_AddRefs(list)); |
60 getter_AddRefs(list)); |
80 if (!list) |
61 if (!list) |
81 return NS_OK; |
62 return NS_OK; |
82 |
63 |
83 bool hasMore; |
64 bool hasMore; |
84 @@ -1173,17 +1192,17 @@ static nsresult pref_LoadPrefsInDirList( |
65 @@ -1161,17 +1180,17 @@ static nsresult pref_LoadPrefsInDirList( |
85 |
66 |
86 nsAutoCString leaf; |
67 nsAutoCString leaf; |
87 path->GetNativeLeafName(leaf); |
68 path->GetNativeLeafName(leaf); |
88 |
69 |
89 // 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? |
98 |
79 |
99 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
80 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
100 { |
81 { |
101 nsZipItemPtr<char> manifest(jarReader, name, true); |
82 nsZipItemPtr<char> manifest(jarReader, name, true); |
102 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
83 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
103 @@ -1277,26 +1296,38 @@ static nsresult pref_InitInitialObjects( |
84 @@ -1265,26 +1284,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 */ |
85 /* 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[] = { |
86 static const char* specialFiles[] = { |
106 #if defined(XP_MACOSX) |
87 #if defined(XP_MACOSX) |
107 "macprefs.js" |
88 "macprefs.js" |
108 #elif defined(XP_WIN) |
89 #elif defined(XP_WIN) |
137 |
118 |
138 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
119 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
139 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
120 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
140 RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
121 RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
141 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
122 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
|
123 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
|
124 --- a/modules/libpref/moz.build |
|
125 +++ b/modules/libpref/moz.build |
|
126 @@ -31,16 +31,20 @@ UNIFIED_SOURCES += [ |
|
127 'prefread.cpp', |
|
128 ] |
|
129 |
|
130 # prefapi.cpp cannot be built in unified mode because it uses plarena.h |
|
131 SOURCES += [ |
|
132 'prefapi.cpp', |
|
133 ] |
|
134 |
|
135 +LOCAL_INCLUDES += [ |
|
136 + '/toolkit/xre' |
|
137 +] |
|
138 + |
|
139 include('/ipc/chromium/chromium-config.mozbuild') |
|
140 |
|
141 FINAL_LIBRARY = 'xul' |
|
142 |
|
143 DEFINES['OS_ARCH'] = CONFIG['OS_ARCH'] |
|
144 DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] |
|
145 |
|
146 if CONFIG['GNU_CXX']: |
142 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
147 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
143 --- a/python/mozbuild/mozpack/chrome/flags.py |
148 --- a/python/mozbuild/mozpack/chrome/flags.py |
144 +++ b/python/mozbuild/mozpack/chrome/flags.py |
149 +++ b/python/mozbuild/mozpack/chrome/flags.py |
145 @@ -211,16 +211,17 @@ class Flags(OrderedDict): |
150 @@ -211,16 +211,17 @@ class Flags(OrderedDict): |
146 'contentaccessible': Flag, |
151 'contentaccessible': Flag, |
224 |
229 |
225 #ifdef MOZ_WIDGET_ANDROID |
230 #ifdef MOZ_WIDGET_ANDROID |
226 #include "AndroidBridge.h" |
231 #include "AndroidBridge.h" |
227 #endif |
232 #endif |
228 |
233 |
229 @@ -2714,16 +2718,25 @@ nsDownload::SetState(DownloadState aStat |
234 @@ -2719,16 +2723,25 @@ nsDownload::SetState(DownloadState aStat |
230 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
235 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
231 |
236 |
232 // Master pref to control this function. |
237 // Master pref to control this function. |
233 bool showTaskbarAlert = true; |
238 bool showTaskbarAlert = true; |
234 if (pref) |
239 if (pref) |
250 |
255 |
251 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
256 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
252 int64_t goat = PR_Now() - mStartTime; |
257 int64_t goat = PR_Now() - mStartTime; |
253 showTaskbarAlert = goat > alertIntervalUSec; |
258 showTaskbarAlert = goat > alertIntervalUSec; |
254 |
259 |
255 @@ -2754,16 +2767,17 @@ nsDownload::SetState(DownloadState aStat |
260 @@ -2759,16 +2772,17 @@ nsDownload::SetState(DownloadState aStat |
256 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
261 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
257 message, !removeWhenDone, |
262 message, !removeWhenDone, |
258 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
263 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
259 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), |
264 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), |
260 EmptyString(), EmptyString(), nullptr, mPrivate); |
265 EmptyString(), EmptyString(), nullptr, mPrivate); |
2695 + |
2700 + |
2696 +#endif // nsKDEUtils |
2701 +#endif // nsKDEUtils |
2697 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
2702 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
2698 --- a/uriloader/exthandler/moz.build |
2703 --- a/uriloader/exthandler/moz.build |
2699 +++ b/uriloader/exthandler/moz.build |
2704 +++ b/uriloader/exthandler/moz.build |
2700 @@ -72,17 +72,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui |
2705 @@ -75,17 +75,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui |
2701 else: |
2706 else: |
2702 # These files can't be built in unified mode because they redefine LOG. |
2707 # These files can't be built in unified mode because they redefine LOG. |
2703 SOURCES += [ |
2708 SOURCES += [ |
2704 osdir + '/nsOSHelperAppService.cpp', |
2709 osdir + '/nsOSHelperAppService.cpp', |
2705 ] |
2710 ] |
2715 UNIFIED_SOURCES += [ |
2720 UNIFIED_SOURCES += [ |
2716 'android/nsAndroidHandlerApp.cpp', |
2721 'android/nsAndroidHandlerApp.cpp', |
2717 'android/nsExternalSharingAppService.cpp', |
2722 'android/nsExternalSharingAppService.cpp', |
2718 'android/nsExternalURLHandlerService.cpp', |
2723 'android/nsExternalURLHandlerService.cpp', |
2719 'android/nsMIMEInfoAndroid.cpp', |
2724 'android/nsMIMEInfoAndroid.cpp', |
2720 @@ -125,16 +127,17 @@ include('/ipc/chromium/chromium-config.m |
2725 @@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m |
2721 |
2726 |
2722 FINAL_LIBRARY = 'xul' |
2727 FINAL_LIBRARY = 'xul' |
2723 |
2728 |
2724 LOCAL_INCLUDES += [ |
2729 LOCAL_INCLUDES += [ |
2725 '/dom/base', |
2730 '/dom/base', |
3660 |
3665 |
3661 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
3666 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
3662 --- a/xpcom/components/moz.build |
3667 --- a/xpcom/components/moz.build |
3663 +++ b/xpcom/components/moz.build |
3668 +++ b/xpcom/components/moz.build |
3664 @@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul' |
3669 @@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul' |
3665 GENERATED_INCLUDES += ['..'] |
|
3666 LOCAL_INCLUDES += [ |
3670 LOCAL_INCLUDES += [ |
|
3671 '!..', |
3667 '../base', |
3672 '../base', |
3668 '../build', |
3673 '../build', |
3669 '../ds', |
3674 '../ds', |
3670 '../reflect/xptinfo', |
3675 '../reflect/xptinfo', |
3671 '/chrome', |
3676 '/chrome', |