38 #define MATCH_OS_LOCALE_PREF "intl.locale.matchOS" |
38 #define MATCH_OS_LOCALE_PREF "intl.locale.matchOS" |
39 #define SELECTED_LOCALE_PREF "general.useragent.locale" |
39 #define SELECTED_LOCALE_PREF "general.useragent.locale" |
40 #define SELECTED_SKIN_PREF "general.skins.selectedSkin" |
40 #define SELECTED_SKIN_PREF "general.skins.selectedSkin" |
41 |
41 |
42 static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID); |
42 static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID); |
43 @@ -1607,16 +1608,17 @@ nsChromeRegistry::ProcessManifestBuffer( |
43 @@ -1608,16 +1609,17 @@ nsChromeRegistry::ProcessManifestBuffer( |
44 |
44 |
45 NS_NAMED_LITERAL_STRING(kPlatform, "platform"); |
45 NS_NAMED_LITERAL_STRING(kPlatform, "platform"); |
46 NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); |
46 NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); |
47 NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); |
47 NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); |
48 NS_NAMED_LITERAL_STRING(kApplication, "application"); |
48 NS_NAMED_LITERAL_STRING(kApplication, "application"); |
56 |
56 |
57 nsCOMPtr<nsIProtocolHandler> ph; |
57 nsCOMPtr<nsIProtocolHandler> ph; |
58 rv = io->GetProtocolHandler("resource", getter_AddRefs(ph)); |
58 rv = io->GetProtocolHandler("resource", getter_AddRefs(ph)); |
59 NS_ENSURE_SUCCESS(rv, rv); |
59 NS_ENSURE_SUCCESS(rv, rv); |
60 |
60 |
61 @@ -1650,35 +1652,39 @@ nsChromeRegistry::ProcessManifestBuffer( |
61 @@ -1651,35 +1653,39 @@ nsChromeRegistry::ProcessManifestBuffer( |
62 if (NS_SUCCEEDED(rv)) { |
62 if (NS_SUCCEEDED(rv)) { |
63 CopyUTF8toUTF16(s, osTarget); |
63 CopyUTF8toUTF16(s, osTarget); |
64 ToLowerCase(osTarget); |
64 ToLowerCase(osTarget); |
65 } |
65 } |
66 } |
66 } |
96 char *newline = buf; |
96 char *newline = buf; |
97 PRUint32 line = 0; |
97 PRUint32 line = 0; |
98 |
98 |
99 // outer loop tokenizes by newline |
99 // outer loop tokenizes by newline |
100 while (nsnull != (token = nsCRT::strtok(newline, kNewlines, &newline))) { |
100 while (nsnull != (token = nsCRT::strtok(newline, kNewlines, &newline))) { |
101 @@ -1712,41 +1718,43 @@ nsChromeRegistry::ProcessManifestBuffer( |
101 @@ -1713,41 +1719,43 @@ nsChromeRegistry::ProcessManifestBuffer( |
102 |
102 |
103 PRBool platform = PR_FALSE; |
103 PRBool platform = PR_FALSE; |
104 PRBool xpcNativeWrappers = PR_TRUE; |
104 PRBool xpcNativeWrappers = PR_TRUE; |
105 PRBool contentAccessible = PR_FALSE; |
105 PRBool contentAccessible = PR_FALSE; |
106 TriState stAppVersion = eUnspecified; |
106 TriState stAppVersion = eUnspecified; |
141 rv = io->NewURI(nsDependentCString(uri), nsnull, manifestURI, |
141 rv = io->NewURI(nsDependentCString(uri), nsnull, manifestURI, |
142 getter_AddRefs(resolved)); |
142 getter_AddRefs(resolved)); |
143 if (NS_FAILED(rv)) |
143 if (NS_FAILED(rv)) |
144 continue; |
144 continue; |
145 |
145 |
146 @@ -1797,38 +1805,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
146 @@ -1798,38 +1806,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
147 } |
147 } |
148 |
148 |
149 EnsureLowerCase(package); |
149 EnsureLowerCase(package); |
150 |
150 |
151 TriState stAppVersion = eUnspecified; |
151 TriState stAppVersion = eUnspecified; |
183 rv = io->NewURI(nsDependentCString(uri), nsnull, manifestURI, |
183 rv = io->NewURI(nsDependentCString(uri), nsnull, manifestURI, |
184 getter_AddRefs(resolved)); |
184 getter_AddRefs(resolved)); |
185 if (NS_FAILED(rv)) |
185 if (NS_FAILED(rv)) |
186 continue; |
186 continue; |
187 |
187 |
188 @@ -1859,38 +1869,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
188 @@ -1860,38 +1870,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
189 } |
189 } |
190 |
190 |
191 EnsureLowerCase(package); |
191 EnsureLowerCase(package); |
192 |
192 |
193 TriState stAppVersion = eUnspecified; |
193 TriState stAppVersion = eUnspecified; |
225 rv = io->NewURI(nsDependentCString(uri), nsnull, manifestURI, |
225 rv = io->NewURI(nsDependentCString(uri), nsnull, manifestURI, |
226 getter_AddRefs(resolved)); |
226 getter_AddRefs(resolved)); |
227 if (NS_FAILED(rv)) |
227 if (NS_FAILED(rv)) |
228 continue; |
228 continue; |
229 |
229 |
230 @@ -1923,38 +1935,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
230 @@ -1924,38 +1936,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
231 "Warning: malformed chrome overlay instruction."); |
231 "Warning: malformed chrome overlay instruction."); |
232 continue; |
232 continue; |
233 } |
233 } |
234 |
234 |
235 TriState stAppVersion = eUnspecified; |
235 TriState stAppVersion = eUnspecified; |
267 rv = io->NewURI(nsDependentCString(base), nsnull, nsnull, |
267 rv = io->NewURI(nsDependentCString(base), nsnull, nsnull, |
268 getter_AddRefs(baseuri)); |
268 getter_AddRefs(baseuri)); |
269 rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull, |
269 rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull, |
270 getter_AddRefs(overlayuri)); |
270 getter_AddRefs(overlayuri)); |
271 if (NS_FAILED(rv)) { |
271 if (NS_FAILED(rv)) { |
272 @@ -1979,38 +1993,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
272 @@ -1980,38 +1994,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
273 "Warning: malformed chrome style instruction."); |
273 "Warning: malformed chrome style instruction."); |
274 continue; |
274 continue; |
275 } |
275 } |
276 |
276 |
277 TriState stAppVersion = eUnspecified; |
277 TriState stAppVersion = eUnspecified; |
309 rv = io->NewURI(nsDependentCString(base), nsnull, nsnull, |
309 rv = io->NewURI(nsDependentCString(base), nsnull, nsnull, |
310 getter_AddRefs(baseuri)); |
310 getter_AddRefs(baseuri)); |
311 rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull, |
311 rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull, |
312 getter_AddRefs(overlayuri)); |
312 getter_AddRefs(overlayuri)); |
313 if (NS_FAILED(rv)) |
313 if (NS_FAILED(rv)) |
314 @@ -2039,38 +2055,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
314 @@ -2040,38 +2056,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
315 "Warning: malformed chrome override instruction."); |
315 "Warning: malformed chrome override instruction."); |
316 continue; |
316 continue; |
317 } |
317 } |
318 |
318 |
319 TriState stAppVersion = eUnspecified; |
319 TriState stAppVersion = eUnspecified; |
351 rv = io->NewURI(nsDependentCString(chrome), nsnull, nsnull, |
351 rv = io->NewURI(nsDependentCString(chrome), nsnull, nsnull, |
352 getter_AddRefs(chromeuri)); |
352 getter_AddRefs(chromeuri)); |
353 rv |= io->NewURI(nsDependentCString(resolved), nsnull, manifestURI, |
353 rv |= io->NewURI(nsDependentCString(resolved), nsnull, manifestURI, |
354 getter_AddRefs(resolveduri)); |
354 getter_AddRefs(resolveduri)); |
355 if (NS_FAILED(rv)) |
355 if (NS_FAILED(rv)) |
356 @@ -2101,38 +2119,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
356 @@ -2102,38 +2120,40 @@ nsChromeRegistry::ProcessManifestBuffer( |
357 } |
357 } |
358 |
358 |
359 EnsureLowerCase(package); |
359 EnsureLowerCase(package); |
360 |
360 |
361 TriState stAppVersion = eUnspecified; |
361 TriState stAppVersion = eUnspecified; |
2591 appshell \ |
2591 appshell \ |
2592 chrome \ |
2592 chrome \ |
2593 content \ |
2593 content \ |
2594 docshell \ |
2594 docshell \ |
2595 dom \ |
2595 dom \ |
2596 @@ -131,17 +133,17 @@ CMMSRCS = nsNativeAppSupportCocoa.mm |
2596 @@ -132,17 +134,17 @@ CMMSRCS = nsNativeAppSupportCocoa.mm |
2597 else |
2597 else |
2598 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2598 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2599 CPPSRCS += nsNativeAppSupportOS2.cpp |
2599 CPPSRCS += nsNativeAppSupportOS2.cpp |
2600 else |
2600 else |
2601 ifeq ($(MOZ_WIDGET_TOOLKIT),beos) |
2601 ifeq ($(MOZ_WIDGET_TOOLKIT),beos) |
3402 +}; |
3402 +}; |
3403 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
3403 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
3404 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
3404 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
3405 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
3405 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
3406 @@ -40,27 +40,30 @@ |
3406 @@ -40,27 +40,30 @@ |
3407 #ifdef MOZ_PLATFORM_HILDON |
3407 #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS) |
3408 #include <glib.h> |
3408 #include <glib.h> |
3409 #include <hildon-uri.h> |
3409 #include <hildon-uri.h> |
3410 #include <hildon-mime.h> |
3410 #include <hildon-mime.h> |
3411 #include <libosso.h> |
3411 #include <libosso.h> |
3412 #endif |
3412 #endif |
3426 nsresult |
3426 nsresult |
3427 nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI) |
3427 nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI) |
3428 { |
3428 { |
3429 - nsresult rv = nsGNOMERegistry::LoadURL(aURI); |
3429 - nsresult rv = nsGNOMERegistry::LoadURL(aURI); |
3430 + nsresult rv = nsCommonRegistry::LoadURL(aURI); |
3430 + nsresult rv = nsCommonRegistry::LoadURL(aURI); |
3431 #ifdef MOZ_PLATFORM_HILDON |
3431 #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS) |
3432 if (NS_FAILED(rv)){ |
3432 if (NS_FAILED(rv)){ |
3433 HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull); |
3433 HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull); |
3434 if (action) { |
3434 if (action) { |
3435 nsCAutoString spec; |
3435 nsCAutoString spec; |
3436 aURI->GetAsciiSpec(spec); |
3436 aURI->GetAsciiSpec(spec); |
3543 |
3543 |
3544 #ifdef MOZ_WIDGET_GTK2 |
3544 #ifdef MOZ_WIDGET_GTK2 |
3545 // Check the GConf registry for a protocol handler |
3545 // Check the GConf registry for a protocol handler |
3546 - *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme); |
3546 - *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme); |
3547 + *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme); |
3547 + *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme); |
3548 #ifdef MOZ_PLATFORM_HILDON |
3548 #ifdef MOZ_PLATFORM_MAEMO |
3549 *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme); |
3549 *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme); |
3550 #endif |
3550 #endif |
3551 #endif |
3551 #endif |
3552 |
3552 |
3553 return NS_OK; |
3553 return NS_OK; |
3649 |
3649 |
3650 #include "nsFilePicker.h" |
3650 #include "nsFilePicker.h" |
3651 #include "nsAccessibilityHelper.h" |
3651 #include "nsAccessibilityHelper.h" |
3652 +#include "nsKDEUtils.h" |
3652 +#include "nsKDEUtils.h" |
3653 |
3653 |
3654 #ifdef MOZ_PLATFORM_HILDON |
3654 #ifdef MOZ_PLATFORM_MAEMO |
3655 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h> |
3655 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h> |
3656 #endif |
3656 #endif |
3657 |
3657 |
3658 #define MAX_PREVIEW_SIZE 180 |
3658 #define MAX_PREVIEW_SIZE 180 |
3659 |
3659 |
3967 endif |
3967 endif |
3968 |
3968 |
3969 LOCAL_INCLUDES = -I.. |
3969 LOCAL_INCLUDES = -I.. |
3970 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
3970 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
3971 |
3971 |
3972 ifdef MOZ_PLATFORM_HILDON |
3972 ifeq ($(MOZ_PLATFORM_MAEMO), 5) |
3973 CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS) |
3973 CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS) |
3974 CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS) |
3974 CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS) |
3975 endif |
3975 endif |
3976 |
3976 |
3977 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3977 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3978 --- a/xpcom/io/nsLocalFileUnix.cpp |
3978 --- a/xpcom/io/nsLocalFileUnix.cpp |
3979 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3979 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3987 #ifdef MOZ_WIDGET_GTK2 |
3987 #ifdef MOZ_WIDGET_GTK2 |
3988 #include "nsIGnomeVFSService.h" |
3988 #include "nsIGnomeVFSService.h" |
3989 +#include "nsKDEUtils.h" |
3989 +#include "nsKDEUtils.h" |
3990 #endif |
3990 #endif |
3991 |
3991 |
3992 #ifdef MOZ_PLATFORM_HILDON |
3992 #if (MOZ_PLATFORM_MAEMO == 5) |
3993 #include <glib.h> |
3993 #include <glib.h> |
3994 #include <hildon-uri.h> |
3994 #include <hildon-uri.h> |
3995 #include <hildon-mime.h> |
3995 #include <hildon-mime.h> |
3996 #include <libosso.h> |
3996 #include <libosso.h> |
3997 #endif |
3997 #endif |