42 |
42 |
43 #include "prefapi.h" |
43 #include "prefapi.h" |
44 #include "prefread.h" |
44 #include "prefread.h" |
45 #include "prefapi_private_data.h" |
45 #include "prefapi_private_data.h" |
46 |
46 |
47 @@ -946,16 +947,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
47 @@ -966,16 +967,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
48 |
48 |
49 static nsresult pref_LoadPrefsInDirList(const char *listId) |
49 static nsresult pref_LoadPrefsInDirList(const char *listId) |
50 { |
50 { |
51 nsresult rv; |
51 nsresult rv; |
52 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
52 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
77 getter_AddRefs(list)); |
77 getter_AddRefs(list)); |
78 if (!list) |
78 if (!list) |
79 return NS_OK; |
79 return NS_OK; |
80 |
80 |
81 bool hasMore; |
81 bool hasMore; |
82 @@ -971,17 +990,17 @@ static nsresult pref_LoadPrefsInDirList( |
82 @@ -991,17 +1010,17 @@ static nsresult pref_LoadPrefsInDirList( |
83 |
83 |
84 nsAutoCString leaf; |
84 nsAutoCString leaf; |
85 path->GetNativeLeafName(leaf); |
85 path->GetNativeLeafName(leaf); |
86 |
86 |
87 // Do we care if a file provided by this process fails to load? |
87 // Do we care if a file provided by this process fails to load? |
96 |
96 |
97 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
97 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
98 { |
98 { |
99 nsZipItemPtr<char> manifest(jarReader, name, true); |
99 nsZipItemPtr<char> manifest(jarReader, name, true); |
100 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
100 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
101 @@ -1075,28 +1094,40 @@ static nsresult pref_InitInitialObjects( |
101 @@ -1095,28 +1114,40 @@ static nsresult pref_InitInitialObjects( |
102 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
102 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
103 static const char* specialFiles[] = { |
103 static const char* specialFiles[] = { |
104 #if defined(XP_MACOSX) |
104 #if defined(XP_MACOSX) |
105 "macprefs.js" |
105 "macprefs.js" |
106 #elif defined(XP_WIN) |
106 #elif defined(XP_WIN) |
137 |
137 |
138 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
138 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
139 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
139 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
140 nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
140 nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
141 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
141 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
|
142 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
|
143 --- a/python/mozbuild/mozpack/chrome/flags.py |
|
144 +++ b/python/mozbuild/mozpack/chrome/flags.py |
|
145 @@ -208,16 +208,17 @@ class Flags(OrderedDict): |
|
146 'platformversion': VersionFlag, |
|
147 'contentaccessible': Flag, |
|
148 'os': StringFlag, |
|
149 'osversion': VersionFlag, |
|
150 'abi': StringFlag, |
|
151 'platform': Flag, |
|
152 'xpcnativewrappers': Flag, |
|
153 'tablet': Flag, |
|
154 + 'desktop': StringFlag, |
|
155 } |
|
156 RE = re.compile(r'([!<>=]+)') |
|
157 |
|
158 def __init__(self, *flags): |
|
159 ''' |
|
160 Initialize a set of flags given in string form. |
|
161 flags = Flags('contentaccessible=yes', 'appversion>=3.5') |
|
162 ''' |
|
163 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py |
|
164 --- a/python/mozbuild/mozpack/chrome/manifest.py |
|
165 +++ b/python/mozbuild/mozpack/chrome/manifest.py |
|
166 @@ -30,16 +30,17 @@ class ManifestEntry(object): |
|
167 allowed_flags = [ |
|
168 'application', |
|
169 'platformversion', |
|
170 'os', |
|
171 'osversion', |
|
172 'abi', |
|
173 'xpcnativewrappers', |
|
174 'tablet', |
|
175 + 'desktop', |
|
176 ] |
|
177 |
|
178 def __init__(self, base, *flags): |
|
179 ''' |
|
180 Initialize a manifest entry with the given base path and flags. |
|
181 ''' |
|
182 self.base = base |
|
183 self.flags = Flags(*flags) |
142 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
184 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
143 --- a/toolkit/components/downloads/Makefile.in |
185 --- a/toolkit/components/downloads/Makefile.in |
144 +++ b/toolkit/components/downloads/Makefile.in |
186 +++ b/toolkit/components/downloads/Makefile.in |
145 @@ -42,9 +42,12 @@ EXTRA_COMPONENTS = \ |
187 @@ -42,9 +42,12 @@ EXTRA_COMPONENTS = \ |
146 nsDownloadManagerUI.manifest \ |
188 nsDownloadManagerUI.manifest \ |
156 + |
198 + |
157 CXXFLAGS += $(TK_CFLAGS) |
199 CXXFLAGS += $(TK_CFLAGS) |
158 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
200 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
159 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
201 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
160 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
202 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
161 @@ -41,16 +41,20 @@ |
203 @@ -38,16 +38,20 @@ |
162 |
204 |
163 #ifdef XP_WIN |
205 #ifdef XP_WIN |
164 #include <shlobj.h> |
206 #include <shlobj.h> |
165 #ifdef DOWNLOAD_SCANNER |
207 #ifdef DOWNLOAD_SCANNER |
166 #include "nsDownloadScanner.h" |
208 #include "nsDownloadScanner.h" |
177 |
219 |
178 #ifdef MOZ_WIDGET_ANDROID |
220 #ifdef MOZ_WIDGET_ANDROID |
179 #include "AndroidBridge.h" |
221 #include "AndroidBridge.h" |
180 #endif |
222 #endif |
181 |
223 |
182 @@ -2739,16 +2743,25 @@ nsDownload::SetState(DownloadState aStat |
224 @@ -2590,16 +2594,25 @@ nsDownload::SetState(DownloadState aStat |
183 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
225 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
184 |
226 |
185 // Master pref to control this function. |
227 // Master pref to control this function. |
186 bool showTaskbarAlert = true; |
228 bool showTaskbarAlert = true; |
187 if (pref) |
229 if (pref) |
203 |
245 |
204 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
246 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
205 int64_t goat = PR_Now() - mStartTime; |
247 int64_t goat = PR_Now() - mStartTime; |
206 showTaskbarAlert = goat > alertIntervalUSec; |
248 showTaskbarAlert = goat > alertIntervalUSec; |
207 |
249 |
208 @@ -2775,19 +2788,20 @@ nsDownload::SetState(DownloadState aStat |
250 @@ -2626,19 +2639,20 @@ nsDownload::SetState(DownloadState aStat |
209 // retention policy, there's no reason to make the text clickable |
251 // retention policy, there's no reason to make the text clickable |
210 // because if it is, they'll click open the download manager and |
252 // because if it is, they'll click open the download manager and |
211 // the items they downloaded will have been removed. |
253 // the items they downloaded will have been removed. |
212 alerts->ShowAlertNotification( |
254 alerts->ShowAlertNotification( |
213 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
255 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
2160 +} |
2202 +} |
2161 + |
2203 + |
2162 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2204 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2163 --- a/toolkit/xre/Makefile.in |
2205 --- a/toolkit/xre/Makefile.in |
2164 +++ b/toolkit/xre/Makefile.in |
2206 +++ b/toolkit/xre/Makefile.in |
2165 @@ -69,17 +69,18 @@ else |
2207 @@ -72,17 +72,18 @@ else |
2166 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2208 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2167 CMMSRCS = nsNativeAppSupportCocoa.mm |
2209 CMMSRCS = nsNativeAppSupportCocoa.mm |
2168 EXPORTS += MacQuirks.h |
2210 EXPORTS += MacQuirks.h |
2169 else |
2211 else |
2170 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2212 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2580 + |
2622 + |
2581 +#endif // nsKDEUtils |
2623 +#endif // nsKDEUtils |
2582 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2624 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2583 --- a/uriloader/exthandler/Makefile.in |
2625 --- a/uriloader/exthandler/Makefile.in |
2584 +++ b/uriloader/exthandler/Makefile.in |
2626 +++ b/uriloader/exthandler/Makefile.in |
2585 @@ -58,18 +58,19 @@ LOCAL_INCLUDES = -I$(srcdir) |
2627 @@ -59,18 +59,19 @@ LOCAL_INCLUDES = -I$(srcdir) |
2586 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ |
2628 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ |
2587 -I$(topsrcdir)/dom/ipc \ |
2629 -I$(topsrcdir)/dom/ipc \ |
2588 -I$(topsrcdir)/content/base/src \ |
2630 -I$(topsrcdir)/content/base/src \ |
2589 -I$(topsrcdir)/content/events/src \ |
2631 -I$(topsrcdir)/content/events/src \ |
2590 -I$(topsrcdir)/netwerk/base/src \ |
2632 -I$(topsrcdir)/netwerk/base/src \ |