43 #include "pldhash.h" |
43 #include "pldhash.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 @@ -937,16 +938,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
48 @@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
49 |
49 |
50 static nsresult pref_LoadPrefsInDirList(const char *listId) |
50 static nsresult pref_LoadPrefsInDirList(const char *listId) |
51 { |
51 { |
52 nsresult rv; |
52 nsresult rv; |
53 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
53 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
78 getter_AddRefs(list)); |
78 getter_AddRefs(list)); |
79 if (!list) |
79 if (!list) |
80 return NS_OK; |
80 return NS_OK; |
81 |
81 |
82 bool hasMore; |
82 bool hasMore; |
83 @@ -962,17 +981,17 @@ static nsresult pref_LoadPrefsInDirList( |
83 @@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList( |
84 |
84 |
85 nsCAutoString leaf; |
85 nsCAutoString leaf; |
86 path->GetNativeLeafName(leaf); |
86 path->GetNativeLeafName(leaf); |
87 |
87 |
88 // Do we care if a file provided by this process fails to load? |
88 // Do we care if a file provided by this process fails to load? |
97 |
97 |
98 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
98 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
99 { |
99 { |
100 nsZipItemPtr<char> manifest(jarReader, name, true); |
100 nsZipItemPtr<char> manifest(jarReader, name, true); |
101 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
101 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
102 @@ -1062,28 +1081,40 @@ static nsresult pref_InitInitialObjects( |
102 @@ -1070,28 +1089,40 @@ static nsresult pref_InitInitialObjects( |
103 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
103 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
104 static const char* specialFiles[] = { |
104 static const char* specialFiles[] = { |
105 #if defined(XP_MACOSX) |
105 #if defined(XP_MACOSX) |
106 "macprefs.js" |
106 "macprefs.js" |
107 #elif defined(XP_WIN) |
107 #elif defined(XP_WIN) |
135 rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles)); |
135 rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles)); |
136 if (NS_FAILED(rv)) |
136 if (NS_FAILED(rv)) |
137 NS_WARNING("Error parsing application default preferences."); |
137 NS_WARNING("Error parsing application default preferences."); |
138 |
138 |
139 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
139 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
|
140 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
140 nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
141 nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
141 if (appJarReader) { |
142 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
142 rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr); |
|
143 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
143 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
144 --- a/toolkit/components/downloads/Makefile.in |
144 --- a/toolkit/components/downloads/Makefile.in |
145 +++ b/toolkit/components/downloads/Makefile.in |
145 +++ b/toolkit/components/downloads/Makefile.in |
146 @@ -73,8 +73,11 @@ EXTRA_COMPONENTS = \ |
146 @@ -73,8 +73,11 @@ EXTRA_COMPONENTS = \ |
147 nsDownloadManagerUI.js \ |
147 nsDownloadManagerUI.js \ |
177 |
177 |
178 #ifdef MOZ_WIDGET_ANDROID |
178 #ifdef MOZ_WIDGET_ANDROID |
179 #include "AndroidBridge.h" |
179 #include "AndroidBridge.h" |
180 #endif |
180 #endif |
181 |
181 |
182 @@ -2221,16 +2225,25 @@ nsDownload::SetState(DownloadState aStat |
182 @@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat |
183 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
183 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
184 |
184 |
185 // Master pref to control this function. |
185 // Master pref to control this function. |
186 bool showTaskbarAlert = true; |
186 bool showTaskbarAlert = true; |
187 if (pref) |
187 if (pref) |
203 |
203 |
204 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
204 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
205 PRInt64 goat = PR_Now() - mStartTime; |
205 PRInt64 goat = PR_Now() - mStartTime; |
206 showTaskbarAlert = goat > alertIntervalUSec; |
206 showTaskbarAlert = goat > alertIntervalUSec; |
207 |
207 |
208 @@ -2254,19 +2267,20 @@ nsDownload::SetState(DownloadState aStat |
208 @@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat |
209 // If downloads are automatically removed per the user's |
209 // If downloads are automatically removed per the user's |
210 // retention policy, there's no reason to make the text clickable |
210 // retention policy, there's no reason to make the text clickable |
211 // because if it is, they'll click open the download manager and |
211 // because if it is, they'll click open the download manager and |
212 // the items they downloaded will have been removed. |
212 // the items they downloaded will have been removed. |
213 alerts->ShowAlertNotification( |
213 alerts->ShowAlertNotification( |
2190 +} |
2190 +} |
2191 + |
2191 + |
2192 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2192 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2193 --- a/toolkit/xre/Makefile.in |
2193 --- a/toolkit/xre/Makefile.in |
2194 +++ b/toolkit/xre/Makefile.in |
2194 +++ b/toolkit/xre/Makefile.in |
2195 @@ -96,17 +96,18 @@ else |
2195 @@ -100,17 +100,18 @@ else |
2196 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2196 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2197 CMMSRCS = nsNativeAppSupportCocoa.mm |
2197 CMMSRCS = nsNativeAppSupportCocoa.mm |
2198 EXPORTS += MacQuirks.h |
2198 EXPORTS += MacQuirks.h |
2199 else |
2199 else |
2200 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2200 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
3753 if (directive->regfunc) { |
3753 if (directive->regfunc) { |
3754 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3754 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3755 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3755 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3756 --- a/xpcom/io/Makefile.in |
3756 --- a/xpcom/io/Makefile.in |
3757 +++ b/xpcom/io/Makefile.in |
3757 +++ b/xpcom/io/Makefile.in |
3758 @@ -188,17 +188,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3758 @@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3759 DEFINES += -D_IMPL_NS_COM |
3759 DEFINES += -D_IMPL_NS_COM |
3760 |
3760 |
3761 ifeq ($(OS_ARCH),Linux) |
3761 ifeq ($(OS_ARCH),Linux) |
3762 ifneq (,$(findstring lib64,$(libdir))) |
3762 ifneq (,$(findstring lib64,$(libdir))) |
3763 DEFINES += -DHAVE_USR_LIB64_DIR |
3763 DEFINES += -DHAVE_USR_LIB64_DIR |
3793 #include <Carbon/Carbon.h> |
3793 #include <Carbon/Carbon.h> |
3794 #include "CocoaFileUtils.h" |
3794 #include "CocoaFileUtils.h" |
3795 #include "prmem.h" |
3795 #include "prmem.h" |
3796 #include "plbase64.h" |
3796 #include "plbase64.h" |
3797 |
3797 |
3798 @@ -1796,44 +1797,51 @@ nsLocalFile::SetPersistentDescriptor(con |
3798 @@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con |
3799 return InitWithNativePath(aPersistentDescriptor); |
3799 return InitWithNativePath(aPersistentDescriptor); |
3800 #endif |
3800 #endif |
3801 } |
3801 } |
3802 |
3802 |
3803 NS_IMETHODIMP |
3803 NS_IMETHODIMP |
3859 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
3859 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
3860 ::CFRelease(url); |
3860 ::CFRelease(url); |
3861 return rv; |
3861 return rv; |
3862 } |
3862 } |
3863 return NS_ERROR_FAILURE; |
3863 return NS_ERROR_FAILURE; |
3864 @@ -1859,16 +1867,23 @@ nsLocalFile::Launch() |
3864 @@ -1861,16 +1869,23 @@ nsLocalFile::Launch() |
3865 |
3865 |
3866 if (nsnull == connection) |
3866 if (nsnull == connection) |
3867 return NS_ERROR_FAILURE; |
3867 return NS_ERROR_FAILURE; |
3868 |
3868 |
3869 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS) |
3869 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS) |