equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent fc87d8519207c57c22fb5a01243722be530679fa |
2 # Parent efd9bcb9a96668b78749748e76c7982149c1bc40 |
3 Description: Add KDE integration to Firefox (toolkit parts) |
3 Description: Add KDE integration to Firefox (toolkit parts) |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
5 Author: Lubos Lunak <lunak@suse.com> |
5 Author: Lubos Lunak <lunak@suse.com> |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
19 endif |
19 endif |
20 |
20 |
21 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
21 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
22 + |
22 + |
23 greprefs.js: $(grepref_files) |
23 greprefs.js: $(grepref_files) |
24 $(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ -o $@) |
24 $(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) $^ -o $@) |
25 |
25 |
26 libs:: greprefs.js |
26 libs:: greprefs.js |
27 $(INSTALL) $^ $(DIST)/bin/ |
27 $(INSTALL) $^ $(DIST)/bin/ |
28 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
28 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
29 --- a/modules/libpref/Preferences.cpp |
29 --- a/modules/libpref/Preferences.cpp |
135 if (NS_FAILED(rv)) |
135 if (NS_FAILED(rv)) |
136 NS_WARNING("Error parsing application default preferences."); |
136 NS_WARNING("Error parsing application default preferences."); |
137 |
137 |
138 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
138 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
139 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
139 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
140 nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
140 RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
141 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
141 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which |
142 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
142 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
143 --- a/python/mozbuild/mozpack/chrome/flags.py |
143 --- a/python/mozbuild/mozpack/chrome/flags.py |
144 +++ b/python/mozbuild/mozpack/chrome/flags.py |
144 +++ b/python/mozbuild/mozpack/chrome/flags.py |
145 @@ -211,16 +211,17 @@ class Flags(OrderedDict): |
145 @@ -211,16 +211,17 @@ class Flags(OrderedDict): |
271 if (fileURL && |
271 if (fileURL && |
272 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
272 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
273 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
273 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
274 --- a/toolkit/content/jar.mn |
274 --- a/toolkit/content/jar.mn |
275 +++ b/toolkit/content/jar.mn |
275 +++ b/toolkit/content/jar.mn |
276 @@ -63,29 +63,33 @@ toolkit.jar: |
276 @@ -64,29 +64,33 @@ toolkit.jar: |
277 content/global/viewZoomOverlay.js |
277 content/global/viewZoomOverlay.js |
278 *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
278 *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
279 content/global/bindings/browser.xml (widgets/browser.xml) |
279 content/global/bindings/browser.xml (widgets/browser.xml) |
280 content/global/bindings/button.xml (widgets/button.xml) |
280 content/global/bindings/button.xml (widgets/button.xml) |
281 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
281 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
2695 + |
2695 + |
2696 +#endif // nsKDEUtils |
2696 +#endif // nsKDEUtils |
2697 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
2697 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
2698 --- a/uriloader/exthandler/moz.build |
2698 --- a/uriloader/exthandler/moz.build |
2699 +++ b/uriloader/exthandler/moz.build |
2699 +++ b/uriloader/exthandler/moz.build |
2700 @@ -68,17 +68,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco |
2700 @@ -72,17 +72,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui |
2701 else: |
2701 else: |
2702 # These files can't be built in unified mode because they redefine LOG. |
2702 # These files can't be built in unified mode because they redefine LOG. |
2703 SOURCES += [ |
2703 SOURCES += [ |
2704 osdir + '/nsOSHelperAppService.cpp', |
2704 osdir + '/nsOSHelperAppService.cpp', |
2705 ] |
2705 ] |
2715 UNIFIED_SOURCES += [ |
2715 UNIFIED_SOURCES += [ |
2716 'android/nsAndroidHandlerApp.cpp', |
2716 'android/nsAndroidHandlerApp.cpp', |
2717 'android/nsExternalSharingAppService.cpp', |
2717 'android/nsExternalSharingAppService.cpp', |
2718 'android/nsExternalURLHandlerService.cpp', |
2718 'android/nsExternalURLHandlerService.cpp', |
2719 'android/nsMIMEInfoAndroid.cpp', |
2719 'android/nsMIMEInfoAndroid.cpp', |
2720 @@ -121,16 +123,17 @@ include('/ipc/chromium/chromium-config.m |
2720 @@ -125,16 +127,17 @@ include('/ipc/chromium/chromium-config.m |
2721 |
2721 |
2722 FINAL_LIBRARY = 'xul' |
2722 FINAL_LIBRARY = 'xul' |
2723 |
2723 |
2724 LOCAL_INCLUDES += [ |
2724 LOCAL_INCLUDES += [ |
2725 '/dom/base', |
2725 '/dom/base', |
3009 |
3009 |
3010 if (mClass == eProtocolInfo) { |
3010 if (mClass == eProtocolInfo) { |
3011 - *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get()); |
3011 - *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get()); |
3012 + *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get()); |
3012 + *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get()); |
3013 } else { |
3013 } else { |
3014 - nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType); |
3014 - RefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType); |
3015 + nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType); |
3015 + RefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType); |
3016 if (!mimeInfo) { |
3016 if (!mimeInfo) { |
3017 nsAutoCString ext; |
3017 nsAutoCString ext; |
3018 nsresult rv = GetPrimaryExtension(ext); |
3018 nsresult rv = GetPrimaryExtension(ext); |
3019 if (NS_SUCCEEDED(rv)) { |
3019 if (NS_SUCCEEDED(rv)) { |
3020 - mimeInfo = nsGNOMERegistry::GetFromExtension(ext); |
3020 - mimeInfo = nsGNOMERegistry::GetFromExtension(ext); |
3118 |
3118 |
3119 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
3119 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
3120 |
3120 |
3121 #ifdef MOZ_WIDGET_GTK |
3121 #ifdef MOZ_WIDGET_GTK |
3122 LOG(("Looking in GNOME registry\n")); |
3122 LOG(("Looking in GNOME registry\n")); |
3123 nsRefPtr<nsMIMEInfoBase> gnomeInfo = |
3123 RefPtr<nsMIMEInfoBase> gnomeInfo = |
3124 - nsGNOMERegistry::GetFromExtension(aFileExt); |
3124 - nsGNOMERegistry::GetFromExtension(aFileExt); |
3125 + nsCommonRegistry::GetFromExtension(aFileExt); |
3125 + nsCommonRegistry::GetFromExtension(aFileExt); |
3126 if (gnomeInfo) { |
3126 if (gnomeInfo) { |
3127 LOG(("Got MIMEInfo from GNOME registry\n")); |
3127 LOG(("Got MIMEInfo from GNOME registry\n")); |
3128 return gnomeInfo.forget(); |
3128 return gnomeInfo.forget(); |
3138 extensions, |
3138 extensions, |
3139 mime_types_description); |
3139 mime_types_description); |
3140 |
3140 |
3141 #ifdef MOZ_WIDGET_GTK |
3141 #ifdef MOZ_WIDGET_GTK |
3142 if (handler.IsEmpty()) { |
3142 if (handler.IsEmpty()) { |
3143 - nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType); |
3143 - RefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType); |
3144 + nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType); |
3144 + RefPtr<nsMIMEInfoBase> gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType); |
3145 if (gnomeInfo) { |
3145 if (gnomeInfo) { |
3146 LOG(("Got MIMEInfo from GNOME registry without extensions; setting them " |
3146 LOG(("Got MIMEInfo from GNOME registry without extensions; setting them " |
3147 "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get())); |
3147 "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get())); |
3148 |
3148 |
3149 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
3149 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
3151 return gnomeInfo.forget(); |
3151 return gnomeInfo.forget(); |
3152 } |
3152 } |
3153 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
3153 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
3154 --- a/widget/gtk/moz.build |
3154 --- a/widget/gtk/moz.build |
3155 +++ b/widget/gtk/moz.build |
3155 +++ b/widget/gtk/moz.build |
3156 @@ -81,16 +81,17 @@ else: |
3156 @@ -86,16 +86,17 @@ else: |
3157 include('/ipc/chromium/chromium-config.mozbuild') |
3157 include('/ipc/chromium/chromium-config.mozbuild') |
3158 |
3158 |
3159 FINAL_LIBRARY = 'xul' |
3159 FINAL_LIBRARY = 'xul' |
3160 |
3160 |
3161 LOCAL_INCLUDES += [ |
3161 LOCAL_INCLUDES += [ |
3584 + desktop = NS_LITERAL_STRING("win"); |
3584 + desktop = NS_LITERAL_STRING("win"); |
3585 #pragma warning(pop) |
3585 #pragma warning(pop) |
3586 #elif defined(MOZ_WIDGET_COCOA) |
3586 #elif defined(MOZ_WIDGET_COCOA) |
3587 SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); |
3587 SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); |
3588 SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor(); |
3588 SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor(); |
3589 nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), |
3589 nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), |
3590 majorVersion, |
3590 majorVersion, |
3591 minorVersion); |
3591 minorVersion); |
3592 + desktop = NS_LITERAL_STRING("macosx"); |
3592 + desktop = NS_LITERAL_STRING("macosx"); |
3593 #elif defined(MOZ_WIDGET_GTK) |
3593 #elif defined(MOZ_WIDGET_GTK) |
3594 nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), |
3594 nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), |