19 libs:: greprefs.js |
19 libs:: greprefs.js |
20 $(INSTALL) $^ $(DIST)/bin/ |
20 $(INSTALL) $^ $(DIST)/bin/ |
21 diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp |
21 diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp |
22 --- a/modules/libpref/src/nsPrefService.cpp |
22 --- a/modules/libpref/src/nsPrefService.cpp |
23 +++ b/modules/libpref/src/nsPrefService.cpp |
23 +++ b/modules/libpref/src/nsPrefService.cpp |
24 @@ -55,16 +55,17 @@ |
24 @@ -53,16 +53,17 @@ |
25 #include "nsIStringEnumerator.h" |
25 #include "nsIStringEnumerator.h" |
26 #include "nsIZipReader.h" |
26 #include "nsIZipReader.h" |
27 #include "nsPrefBranch.h" |
27 #include "nsPrefBranch.h" |
28 #include "nsXPIDLString.h" |
28 #include "nsXPIDLString.h" |
29 #include "nsCRT.h" |
29 #include "nsCRT.h" |
87 } |
87 } |
88 return NS_OK; |
88 return NS_OK; |
89 } |
89 } |
90 |
90 |
91 //---------------------------------------------------------------------------------------- |
91 //---------------------------------------------------------------------------------------- |
92 @@ -890,24 +909,36 @@ static nsresult pref_InitInitialObjects( |
92 @@ -876,24 +895,36 @@ static nsresult pref_InitInitialObjects( |
93 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
93 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
94 static const char* specialFiles[] = { |
94 static const char* specialFiles[] = { |
95 #if defined(XP_MAC) || defined(XP_MACOSX) |
95 #if defined(XP_MAC) || defined(XP_MACOSX) |
96 "macprefs.js" |
96 "macprefs.js" |
97 #elif defined(XP_WIN) |
97 #elif defined(XP_WIN) |
158 + |
158 + |
159 #ifdef XP_MACOSX |
159 #ifdef XP_MACOSX |
160 #include <CoreFoundation/CoreFoundation.h> |
160 #include <CoreFoundation/CoreFoundation.h> |
161 #endif |
161 #endif |
162 |
162 |
163 #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties" |
163 #ifdef ANDROID |
164 #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" |
164 #include "AndroidBridge.h" |
165 #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" |
165 #endif |
166 #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" |
166 |
167 @@ -2199,16 +2203,25 @@ nsDownload::SetState(DownloadState aStat |
167 @@ -2203,16 +2207,25 @@ nsDownload::SetState(DownloadState aStat |
168 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
168 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
169 |
169 |
170 // Master pref to control this function. |
170 // Master pref to control this function. |
171 PRBool showTaskbarAlert = PR_TRUE; |
171 PRBool showTaskbarAlert = PR_TRUE; |
172 if (pref) |
172 if (pref) |
188 |
188 |
189 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
189 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
190 PRInt64 goat = PR_Now() - mStartTime; |
190 PRInt64 goat = PR_Now() - mStartTime; |
191 showTaskbarAlert = goat > alertIntervalUSec; |
191 showTaskbarAlert = goat > alertIntervalUSec; |
192 |
192 |
193 @@ -2234,16 +2247,17 @@ nsDownload::SetState(DownloadState aStat |
193 @@ -2237,17 +2250,17 @@ nsDownload::SetState(DownloadState aStat |
|
194 // retention policy, there's no reason to make the text clickable |
194 // because if it is, they'll click open the download manager and |
195 // because if it is, they'll click open the download manager and |
195 // the items they downloaded will have been removed. |
196 // the items they downloaded will have been removed. |
196 alerts->ShowAlertNotification( |
197 alerts->ShowAlertNotification( |
197 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
198 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
198 message, !removeWhenDone, EmptyString(), mDownloadManager, |
199 message, !removeWhenDone, EmptyString(), mDownloadManager, |
199 EmptyString()); |
200 EmptyString()); |
200 } |
201 } |
201 } |
202 - } |
202 + } // end non-KDE block |
203 + } // end non-KDE block |
203 } |
204 } |
204 |
205 |
205 #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) |
206 #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) || defined(ANDROID) |
206 nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); |
207 nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); |
207 nsCOMPtr<nsIFile> file; |
208 nsCOMPtr<nsIFile> file; |
208 nsAutoString path; |
209 nsAutoString path; |
209 |
210 |
210 if (fileURL && |
211 if (fileURL && |
2571 + |
2572 + |
2572 +#endif // nsKDEUtils |
2573 +#endif // nsKDEUtils |
2573 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2574 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2574 --- a/uriloader/exthandler/Makefile.in |
2575 --- a/uriloader/exthandler/Makefile.in |
2575 +++ b/uriloader/exthandler/Makefile.in |
2576 +++ b/uriloader/exthandler/Makefile.in |
2576 @@ -90,18 +90,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas |
2577 @@ -88,18 +88,19 @@ LOCAL_INCLUDES = -I$(srcdir) |
|
2578 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ |
2577 -I$(topsrcdir)/dom/ipc \ |
2579 -I$(topsrcdir)/dom/ipc \ |
2578 -I$(topsrcdir)/content/base/src \ |
2580 -I$(topsrcdir)/content/base/src \ |
2579 -I$(topsrcdir)/content/events/src \ |
2581 -I$(topsrcdir)/content/events/src \ |
2580 -I$(topsrcdir)/netwerk/base/src \ |
2582 -I$(topsrcdir)/netwerk/base/src \ |
2581 -I$(topsrcdir)/netwerk/protocol/http |
2583 -I$(topsrcdir)/netwerk/protocol/http |
2582 endif |
|
2583 |
2584 |
2584 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
2585 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
2585 -OSHELPER += nsGNOMERegistry.cpp |
2586 -OSHELPER += nsGNOMERegistry.cpp |
2586 +OSHELPER += nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp |
2587 +OSHELPER += nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp |
2587 OSHELPER += nsMIMEInfoUnix.cpp |
2588 OSHELPER += nsMIMEInfoUnix.cpp |
3633 + stDesktop == eBad || |
3634 + stDesktop == eBad || |
3634 stABI == eBad) |
3635 stABI == eBad) |
3635 continue; |
3636 continue; |
3636 |
3637 |
3637 if (directive->regfunc) { |
3638 if (directive->regfunc) { |
3638 #ifdef MOZ_IPC |
|
3639 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3639 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3640 continue; |
3640 continue; |
3641 #endif |
3641 |
|
3642 if (!nsChromeRegistry::gChromeRegistry) { |
3642 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3643 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3643 --- a/xpcom/io/Makefile.in |
3644 --- a/xpcom/io/Makefile.in |
3644 +++ b/xpcom/io/Makefile.in |
3645 +++ b/xpcom/io/Makefile.in |
3645 @@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3646 @@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3646 DEFINES += -D_IMPL_NS_COM |
3647 DEFINES += -D_IMPL_NS_COM |