25 libs:: greprefs.js |
25 libs:: greprefs.js |
26 $(INSTALL) $^ $(DIST)/bin/ |
26 $(INSTALL) $^ $(DIST)/bin/ |
27 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp |
27 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp |
28 --- a/modules/libpref/src/Preferences.cpp |
28 --- a/modules/libpref/src/Preferences.cpp |
29 +++ b/modules/libpref/src/Preferences.cpp |
29 +++ b/modules/libpref/src/Preferences.cpp |
30 @@ -56,16 +56,17 @@ |
30 @@ -57,16 +57,17 @@ |
31 #include "nsIStringEnumerator.h" |
31 #include "nsIStringEnumerator.h" |
32 #include "nsIZipReader.h" |
32 #include "nsIZipReader.h" |
33 #include "nsPrefBranch.h" |
33 #include "nsPrefBranch.h" |
34 #include "nsXPIDLString.h" |
34 #include "nsXPIDLString.h" |
35 #include "nsCRT.h" |
35 #include "nsCRT.h" |
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 @@ -935,30 +936,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
48 @@ -937,16 +938,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
49 } |
|
50 |
49 |
51 static nsresult pref_LoadPrefsInDirList(const char *listId) |
50 static nsresult pref_LoadPrefsInDirList(const char *listId) |
52 { |
51 { |
53 nsresult rv; |
52 nsresult rv; |
54 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
53 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
55 if (NS_FAILED(rv)) return rv; |
54 if (NS_FAILED(rv)) |
|
55 return rv; |
56 |
56 |
57 + // make sure we load these special files after all the others |
57 + // make sure we load these special files after all the others |
58 + static const char* specialFiles[] = { |
58 + static const char* specialFiles[] = { |
59 +#if defined(XP_UNIX) |
59 +#if defined(XP_UNIX) |
60 + "" |
60 + "" |
70 + break; |
70 + break; |
71 + } |
71 + } |
72 + } |
72 + } |
73 + } |
73 + } |
74 + |
74 + |
75 nsCOMPtr<nsISimpleEnumerator> dirList; |
75 nsCOMPtr<nsISimpleEnumerator> list; |
76 dirSvc->Get(listId, |
76 dirSvc->Get(listId, |
77 NS_GET_IID(nsISimpleEnumerator), |
77 NS_GET_IID(nsISimpleEnumerator), |
78 getter_AddRefs(dirList)); |
78 getter_AddRefs(list)); |
79 if (dirList) { |
79 if (!list) |
80 bool hasMore; |
80 return NS_OK; |
81 while (NS_SUCCEEDED(dirList->HasMoreElements(&hasMore)) && hasMore) { |
81 |
82 nsCOMPtr<nsISupports> elem; |
82 bool hasMore; |
83 dirList->GetNext(getter_AddRefs(elem)); |
83 @@ -962,17 +981,17 @@ static nsresult pref_LoadPrefsInDirList( |
84 if (elem) { |
84 |
85 nsCOMPtr<nsIFile> dir = do_QueryInterface(elem); |
85 nsCAutoString leaf; |
86 if (dir) { |
86 path->GetNativeLeafName(leaf); |
87 // Do we care if a file provided by this process fails to load? |
87 |
88 - pref_LoadPrefsInDir(dir, nsnull, 0); |
88 // Do we care if a file provided by this process fails to load? |
89 + pref_LoadPrefsInDir(dir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); |
89 if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi"))) |
90 } |
90 ReadExtensionPrefs(path); |
91 } |
91 else |
92 } |
92 - pref_LoadPrefsInDir(path, nsnull, 0); |
|
93 + pref_LoadPrefsInDir(path, specialFiles, NS_ARRAY_LENGTH(specialFiles)); |
93 } |
94 } |
94 return NS_OK; |
95 return NS_OK; |
95 } |
96 } |
96 |
97 |
97 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
98 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
98 @@ -1051,28 +1070,40 @@ static nsresult pref_InitInitialObjects( |
99 { |
|
100 nsZipItemPtr<char> manifest(jarReader, name, true); |
|
101 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
|
102 @@ -1062,28 +1081,40 @@ static nsresult pref_InitInitialObjects( |
99 /* 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 */ |
100 static const char* specialFiles[] = { |
104 static const char* specialFiles[] = { |
101 #if defined(XP_MACOSX) |
105 #if defined(XP_MACOSX) |
102 "macprefs.js" |
106 "macprefs.js" |
103 #elif defined(XP_WIN) |
107 #elif defined(XP_WIN) |
137 if (appJarReader) { |
141 if (appJarReader) { |
138 rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr); |
142 rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr); |
139 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 |
140 --- a/toolkit/components/downloads/Makefile.in |
144 --- a/toolkit/components/downloads/Makefile.in |
141 +++ b/toolkit/components/downloads/Makefile.in |
145 +++ b/toolkit/components/downloads/Makefile.in |
142 @@ -75,8 +75,10 @@ EXTRA_COMPONENTS = \ |
146 @@ -73,8 +73,11 @@ EXTRA_COMPONENTS = \ |
|
147 nsDownloadManagerUI.js \ |
|
148 nsDownloadManagerUI.manifest \ |
143 $(NULL) |
149 $(NULL) |
144 endif |
150 endif |
145 |
151 |
146 ifdef ENABLE_TESTS |
152 TEST_DIRS += test |
147 DIRS += test |
|
148 endif |
|
149 |
153 |
150 include $(topsrcdir)/config/rules.mk |
154 include $(topsrcdir)/config/rules.mk |
151 + |
155 + |
152 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
156 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
|
157 + |
153 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
158 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
154 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
159 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
155 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
160 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
156 @@ -74,16 +74,20 @@ |
161 @@ -74,16 +74,20 @@ |
157 |
162 |
172 |
177 |
173 #ifdef MOZ_WIDGET_ANDROID |
178 #ifdef MOZ_WIDGET_ANDROID |
174 #include "AndroidBridge.h" |
179 #include "AndroidBridge.h" |
175 #endif |
180 #endif |
176 |
181 |
177 @@ -2214,16 +2218,25 @@ nsDownload::SetState(DownloadState aStat |
182 @@ -2221,16 +2225,25 @@ nsDownload::SetState(DownloadState aStat |
178 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
183 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
179 |
184 |
180 // Master pref to control this function. |
185 // Master pref to control this function. |
181 bool showTaskbarAlert = true; |
186 bool showTaskbarAlert = true; |
182 if (pref) |
187 if (pref) |
198 |
203 |
199 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
204 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
200 PRInt64 goat = PR_Now() - mStartTime; |
205 PRInt64 goat = PR_Now() - mStartTime; |
201 showTaskbarAlert = goat > alertIntervalUSec; |
206 showTaskbarAlert = goat > alertIntervalUSec; |
202 |
207 |
203 @@ -2247,19 +2260,20 @@ nsDownload::SetState(DownloadState aStat |
208 @@ -2254,19 +2267,20 @@ nsDownload::SetState(DownloadState aStat |
204 // If downloads are automatically removed per the user's |
209 // If downloads are automatically removed per the user's |
205 // retention policy, there's no reason to make the text clickable |
210 // retention policy, there's no reason to make the text clickable |
206 // 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 |
207 // the items they downloaded will have been removed. |
212 // the items they downloaded will have been removed. |
208 alerts->ShowAlertNotification( |
213 alerts->ShowAlertNotification( |
223 if (fileURL && |
228 if (fileURL && |
224 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
229 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
225 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
230 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
226 --- a/toolkit/content/jar.mn |
231 --- a/toolkit/content/jar.mn |
227 +++ b/toolkit/content/jar.mn |
232 +++ b/toolkit/content/jar.mn |
228 @@ -40,29 +40,33 @@ toolkit.jar: |
233 @@ -44,29 +44,33 @@ toolkit.jar: |
229 *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) |
234 *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) |
230 *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
235 *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
231 *+ content/global/bindings/browser.xml (widgets/browser.xml) |
236 *+ content/global/bindings/browser.xml (widgets/browser.xml) |
232 *+ content/global/bindings/button.xml (widgets/button.xml) |
237 *+ content/global/bindings/button.xml (widgets/button.xml) |
233 *+ content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
238 *+ content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
2090 +# PrefWindow I (June 4, 1999) |
2095 +# PrefWindow I (June 4, 1999) |
2091 +# |
2096 +# |
2092 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2097 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2093 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2098 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2094 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2099 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2095 @@ -45,16 +45,18 @@ |
2100 @@ -46,16 +46,18 @@ |
2096 #include "nsReadableUtils.h" |
|
2097 #include "nsArrayUtils.h" |
2101 #include "nsArrayUtils.h" |
2098 #include "prnetdb.h" |
2102 #include "prnetdb.h" |
2099 #include "prenv.h" |
2103 #include "prenv.h" |
2100 #include "nsPrintfCString.h" |
2104 #include "nsPrintfCString.h" |
2101 #include "nsNetUtil.h" |
2105 #include "nsNetUtil.h" |
2102 #include "nsISupportsPrimitives.h" |
2106 #include "nsISupportsPrimitives.h" |
2103 #include "nsIGSettingsService.h" |
2107 #include "nsIGSettingsService.h" |
|
2108 #include "nsInterfaceHashtable.h" |
2104 +#include "nsVoidArray.h" |
2109 +#include "nsVoidArray.h" |
2105 +#include "nsKDEUtils.h" |
2110 +#include "nsKDEUtils.h" |
2106 |
2111 |
2107 class nsUnixSystemProxySettings : public nsISystemProxySettings { |
2112 class nsUnixSystemProxySettings : public nsISystemProxySettings { |
2108 public: |
2113 public: |
2109 NS_DECL_ISUPPORTS |
2114 NS_DECL_ISUPPORTS |
2110 NS_DECL_NSISYSTEMPROXYSETTINGS |
2115 NS_DECL_NSISYSTEMPROXYSETTINGS |
2111 |
2116 |
2112 nsUnixSystemProxySettings() {} |
2117 nsUnixSystemProxySettings() {} |
2113 nsresult Init(); |
2118 nsresult Init(); |
2114 @@ -64,16 +66,17 @@ private: |
2119 @@ -67,16 +69,17 @@ private: |
2115 |
|
2116 nsCOMPtr<nsIGConfService> mGConf; |
|
2117 nsCOMPtr<nsIGSettingsService> mGSettings; |
2120 nsCOMPtr<nsIGSettingsService> mGSettings; |
|
2121 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
|
2122 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; |
2118 bool IsProxyMode(const char* aMode); |
2123 bool IsProxyMode(const char* aMode); |
2119 nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); |
2124 nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); |
2120 nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); |
2125 nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); |
2121 nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); |
2126 nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); |
2122 nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult); |
2127 nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult); |
2127 |
2132 |
2128 nsresult |
2133 nsresult |
2129 nsUnixSystemProxySettings::Init() |
2134 nsUnixSystemProxySettings::Init() |
2130 { |
2135 { |
2131 // If this is a GNOME session, load gconf and try to use its preferences. |
2136 // If this is a GNOME session, load gconf and try to use its preferences. |
2132 @@ -526,16 +529,19 @@ nsUnixSystemProxySettings::GetProxyForUR |
2137 @@ -529,16 +532,19 @@ nsUnixSystemProxySettings::GetProxyForUR |
2133 nsCAutoString host; |
2138 nsCAutoString host; |
2134 rv = aURI->GetHost(host); |
2139 rv = aURI->GetHost(host); |
2135 NS_ENSURE_SUCCESS(rv, rv); |
2140 NS_ENSURE_SUCCESS(rv, rv); |
2136 |
2141 |
2137 PRInt32 port; |
2142 PRInt32 port; |
2139 NS_ENSURE_SUCCESS(rv, rv); |
2144 NS_ENSURE_SUCCESS(rv, rv); |
2140 |
2145 |
2141 + if( nsKDEUtils::kdeSupport()) |
2146 + if( nsKDEUtils::kdeSupport()) |
2142 + return GetProxyFromKDE(scheme, host, port, aResult); |
2147 + return GetProxyFromKDE(scheme, host, port, aResult); |
2143 + |
2148 + |
2144 if (mGSettings) { |
2149 if (mProxySettings) { |
2145 rv = GetProxyFromGSettings(scheme, host, port, aResult); |
2150 rv = GetProxyFromGSettings(scheme, host, port, aResult); |
2146 if (rv == NS_OK) |
2151 if (rv == NS_OK) |
2147 return rv; |
2152 return rv; |
2148 } |
2153 } |
2149 if (mGConf) |
2154 if (mGConf) |
2150 return GetProxyFromGConf(scheme, host, port, aResult); |
2155 return GetProxyFromGConf(scheme, host, port, aResult); |
2151 |
2156 |
2152 @@ -561,8 +567,34 @@ static const mozilla::Module::ContractID |
2157 @@ -564,8 +570,34 @@ static const mozilla::Module::ContractID |
2153 |
2158 |
2154 static const mozilla::Module kUnixProxyModule = { |
2159 static const mozilla::Module kUnixProxyModule = { |
2155 mozilla::Module::kVersion, |
2160 mozilla::Module::kVersion, |
2156 kUnixProxyCIDs, |
2161 kUnixProxyCIDs, |
2157 kUnixProxyContracts |
2162 kUnixProxyContracts |
2671 + |
2676 + |
2672 +#endif // nsKDEUtils |
2677 +#endif // nsKDEUtils |
2673 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2678 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2674 --- a/uriloader/exthandler/Makefile.in |
2679 --- a/uriloader/exthandler/Makefile.in |
2675 +++ b/uriloader/exthandler/Makefile.in |
2680 +++ b/uriloader/exthandler/Makefile.in |
2676 @@ -92,18 +92,19 @@ LOCAL_INCLUDES = -I$(srcdir) |
2681 @@ -90,18 +90,19 @@ LOCAL_INCLUDES = -I$(srcdir) |
2677 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ |
2682 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ |
2678 -I$(topsrcdir)/dom/ipc \ |
2683 -I$(topsrcdir)/dom/ipc \ |
2679 -I$(topsrcdir)/content/base/src \ |
2684 -I$(topsrcdir)/content/base/src \ |
2680 -I$(topsrcdir)/content/events/src \ |
2685 -I$(topsrcdir)/content/events/src \ |
2681 -I$(topsrcdir)/netwerk/base/src \ |
2686 -I$(topsrcdir)/netwerk/base/src \ |
3248 |
3253 |
3249 // Now look up our extensions |
3254 // Now look up our extensions |
3250 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3255 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3251 --- a/widget/gtk2/Makefile.in |
3256 --- a/widget/gtk2/Makefile.in |
3252 +++ b/widget/gtk2/Makefile.in |
3257 +++ b/widget/gtk2/Makefile.in |
3253 @@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX |
3258 @@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3254 |
3259 |
3255 INCLUDES += \ |
3260 INCLUDES += \ |
3256 -I$(srcdir)/../xpwidgets \ |
3261 -I$(srcdir)/../xpwidgets \ |
3257 -I$(srcdir)/../shared \ |
3262 -I$(srcdir)/../shared \ |
3258 -I$(topsrcdir)/layout/generic \ |
3263 -I$(topsrcdir)/layout/generic \ |
3602 |
3607 |
3603 #endif |
3608 #endif |
3604 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in |
3609 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in |
3605 --- a/xpcom/components/Makefile.in |
3610 --- a/xpcom/components/Makefile.in |
3606 +++ b/xpcom/components/Makefile.in |
3611 +++ b/xpcom/components/Makefile.in |
3607 @@ -92,10 +92,11 @@ LOCAL_INCLUDES = \ |
3612 @@ -91,10 +91,11 @@ LOCAL_INCLUDES = \ |
3608 # we don't want the shared lib, but we want to force the creation of a static lib. |
3613 # we don't want the shared lib, but we want to force the creation of a static lib. |
3609 FORCE_STATIC_LIB = 1 |
3614 FORCE_STATIC_LIB = 1 |
3610 |
3615 |
3611 include $(topsrcdir)/config/rules.mk |
3616 include $(topsrcdir)/config/rules.mk |
3612 |
3617 |
3617 CXXFLAGS += $(MOZ_GTK2_CFLAGS) |
3622 CXXFLAGS += $(MOZ_GTK2_CFLAGS) |
3618 endif |
3623 endif |
3619 diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp |
3624 diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp |
3620 --- a/xpcom/components/ManifestParser.cpp |
3625 --- a/xpcom/components/ManifestParser.cpp |
3621 +++ b/xpcom/components/ManifestParser.cpp |
3626 +++ b/xpcom/components/ManifestParser.cpp |
3622 @@ -62,16 +62,17 @@ |
3627 @@ -63,16 +63,17 @@ |
3623 #include "nsTextFormatter.h" |
3628 #include "nsTextFormatter.h" |
3624 #include "nsVersionComparator.h" |
3629 #include "nsVersionComparator.h" |
3625 #include "nsXPCOMCIDInternal.h" |
3630 #include "nsXPCOMCIDInternal.h" |
3626 |
3631 |
3627 #include "nsIConsoleService.h" |
3632 #include "nsIConsoleService.h" |
3635 struct ManifestDirective |
3640 struct ManifestDirective |
3636 { |
3641 { |
3637 const char* directive; |
3642 const char* directive; |
3638 int argc; |
3643 int argc; |
3639 |
3644 |
3640 @@ -429,16 +430,17 @@ ParseManifest(NSLocationType type, FileL |
3645 @@ -430,16 +431,17 @@ ParseManifest(NSLocationType type, FileL |
3641 NS_NAMED_LITERAL_STRING(kPlatform, "platform"); |
3646 NS_NAMED_LITERAL_STRING(kPlatform, "platform"); |
3642 NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); |
3647 NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); |
3643 NS_NAMED_LITERAL_STRING(kApplication, "application"); |
3648 NS_NAMED_LITERAL_STRING(kApplication, "application"); |
3644 NS_NAMED_LITERAL_STRING(kAppVersion, "appversion"); |
3649 NS_NAMED_LITERAL_STRING(kAppVersion, "appversion"); |
3645 NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion"); |
3650 NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion"); |
3653 |
3658 |
3654 // Obsolete |
3659 // Obsolete |
3655 NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); |
3660 NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); |
3656 |
3661 |
3657 nsAutoString appID; |
3662 nsAutoString appID; |
3658 @@ -476,41 +478,46 @@ ParseManifest(NSLocationType type, FileL |
3663 @@ -477,41 +479,46 @@ ParseManifest(NSLocationType type, FileL |
3659 CopyUTF8toUTF16(s, abi); |
3664 CopyUTF8toUTF16(s, abi); |
3660 abi.Insert(PRUnichar('_'), 0); |
3665 abi.Insert(PRUnichar('_'), 0); |
3661 abi.Insert(osTarget, 0); |
3666 abi.Insert(osTarget, 0); |
3662 } |
3667 } |
3663 } |
3668 } |
3700 // at the end. |
3705 // at the end. |
3701 nsTArray<CachedDirective> contracts; |
3706 nsTArray<CachedDirective> contracts; |
3702 |
3707 |
3703 char *token; |
3708 char *token; |
3704 char *newline = buf; |
3709 char *newline = buf; |
3705 @@ -592,24 +599,26 @@ ParseManifest(NSLocationType type, FileL |
3710 @@ -593,24 +600,26 @@ ParseManifest(NSLocationType type, FileL |
3706 TriState stOsVersion = eUnspecified; |
3711 TriState stOsVersion = eUnspecified; |
3707 TriState stOs = eUnspecified; |
3712 TriState stOs = eUnspecified; |
3708 TriState stABI = eUnspecified; |
3713 TriState stABI = eUnspecified; |
3709 #if defined(MOZ_WIDGET_ANDROID) |
3714 #if defined(MOZ_WIDGET_ANDROID) |
3710 TriState stTablet = eUnspecified; |
3715 TriState stTablet = eUnspecified; |
3727 continue; |
3732 continue; |
3728 |
3733 |
3729 #if defined(MOZ_WIDGET_ANDROID) |
3734 #if defined(MOZ_WIDGET_ANDROID) |
3730 bool tablet = false; |
3735 bool tablet = false; |
3731 if (CheckFlag(kTablet, wtoken, tablet)) { |
3736 if (CheckFlag(kTablet, wtoken, tablet)) { |
3732 @@ -638,16 +647,17 @@ ParseManifest(NSLocationType type, FileL |
3737 @@ -639,16 +648,17 @@ ParseManifest(NSLocationType type, FileL |
3733 } |
3738 } |
3734 |
3739 |
3735 if (!ok || |
3740 if (!ok || |
3736 stApp == eBad || |
3741 stApp == eBad || |
3737 stAppVersion == eBad || |
3742 stAppVersion == eBad || |
3854 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
3859 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
3855 ::CFRelease(url); |
3860 ::CFRelease(url); |
3856 return rv; |
3861 return rv; |
3857 } |
3862 } |
3858 return NS_ERROR_FAILURE; |
3863 return NS_ERROR_FAILURE; |
3859 @@ -1858,16 +1866,23 @@ nsLocalFile::Launch() |
3864 @@ -1859,16 +1867,23 @@ nsLocalFile::Launch() |
3860 |
3865 |
3861 if (nsnull == connection) |
3866 if (nsnull == connection) |
3862 return NS_ERROR_FAILURE; |
3867 return NS_ERROR_FAILURE; |
3863 |
3868 |
3864 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS) |
3869 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS) |