87 } |
87 } |
88 return NS_OK; |
88 return NS_OK; |
89 } |
89 } |
90 |
90 |
91 //---------------------------------------------------------------------------------------- |
91 //---------------------------------------------------------------------------------------- |
92 @@ -837,28 +856,40 @@ static nsresult pref_InitDefaults() |
92 @@ -814,28 +833,40 @@ static nsresult pref_InitDefaults() |
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) |
165 |
165 |
166 #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties" |
166 #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties" |
167 #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" |
167 #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" |
168 #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" |
168 #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" |
169 #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" |
169 #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" |
170 @@ -2188,16 +2192,25 @@ nsDownload::SetState(DownloadState aStat |
170 @@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat |
171 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
171 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
172 |
172 |
173 // Master pref to control this function. |
173 // Master pref to control this function. |
174 PRBool showTaskbarAlert = PR_TRUE; |
174 PRBool showTaskbarAlert = PR_TRUE; |
175 if (pref) |
175 if (pref) |
191 |
191 |
192 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
192 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
193 PRInt64 goat = PR_Now() - mStartTime; |
193 PRInt64 goat = PR_Now() - mStartTime; |
194 showTaskbarAlert = goat > alertIntervalUSec; |
194 showTaskbarAlert = goat > alertIntervalUSec; |
195 |
195 |
196 @@ -2223,16 +2236,17 @@ nsDownload::SetState(DownloadState aStat |
196 @@ -2227,16 +2240,17 @@ nsDownload::SetState(DownloadState aStat |
197 // because if it is, they'll click open the download manager and |
197 // because if it is, they'll click open the download manager and |
198 // the items they downloaded will have been removed. |
198 // the items they downloaded will have been removed. |
199 alerts->ShowAlertNotification( |
199 alerts->ShowAlertNotification( |
200 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
200 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
201 message, !removeWhenDone, EmptyString(), mDownloadManager, |
201 message, !removeWhenDone, EmptyString(), mDownloadManager, |
3645 continue; |
3645 continue; |
3646 #endif |
3646 #endif |
3647 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3647 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3648 --- a/xpcom/io/Makefile.in |
3648 --- a/xpcom/io/Makefile.in |
3649 +++ b/xpcom/io/Makefile.in |
3649 +++ b/xpcom/io/Makefile.in |
3650 @@ -191,17 +191,17 @@ include $(topsrcdir)/config/rules.mk |
3650 @@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3651 DEFINES += -D_IMPL_NS_COM |
3651 DEFINES += -D_IMPL_NS_COM |
3652 |
3652 |
3653 ifeq ($(OS_ARCH),Linux) |
3653 ifeq ($(OS_ARCH),Linux) |
3654 ifneq (,$(findstring lib64,$(libdir))) |
3654 ifneq (,$(findstring lib64,$(libdir))) |
3655 DEFINES += -DHAVE_USR_LIB64_DIR |
3655 DEFINES += -DHAVE_USR_LIB64_DIR |
3656 endif |
3656 endif |
3657 endif |
3657 endif |
3658 |
3658 |
3659 -LOCAL_INCLUDES = -I.. |
3659 -LOCAL_INCLUDES += -I.. |
3660 +LOCAL_INCLUDES = -I.. -I$(topsrcdir)/toolkit/xre |
3660 +LOCAL_INCLUDES += -I.. -I$(topsrcdir)/toolkit/xre |
3661 |
3661 |
3662 ifeq ($(MOZ_PLATFORM_MAEMO),5) |
3662 ifeq ($(MOZ_PLATFORM_MAEMO),5) |
3663 CFLAGS += $(MOZ_DBUS_CFLAGS) |
3663 CFLAGS += $(MOZ_DBUS_CFLAGS) |
3664 CXXFLAGS += $(MOZ_DBUS_CFLAGS) |
3664 CXXFLAGS += $(MOZ_DBUS_CFLAGS) |
3665 endif |
3665 endif |