mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:b0b3c507e253
+:87f893cf45b9
 # HG changeset patch
-# Parent  d685597ba96ea004052e40ec0c80f422ea0e365c
+# Parent  ff3da33eabc1d8760ec41a87afbaf44ded300ede
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 https://bugzilla.novell.com/show_bug.cgi?id=170055
 #endif
 #ifdef XP_WIN
 #include "windows.h"
 #endif
-@@ -4908,25 +4909,37 @@ Preferences::InitInitialObjects(bool aIs
+@@ -4466,25 +4467,37 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
 // application pref files for backwards compatibility.
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 +        break;
 +      }
 +    }
 +  }
 +
-rv = pref_LoadPrefsInDir(
+rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
-defaultPrefDir, specialFiles, ArrayLength(specialFiles));
+ArrayLength(specialFiles));
 if (NS_FAILED(rv)) {
 NS_WARNING("Error parsing application default preferences.");
 }
 // Load jar:$app/omni.jar!/defaults/preferences/*.js
 // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -4975,17 +4988,17 @@ Preferences::InitInitialObjects(bool aIs
+@@ -4532,17 +4545,17 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
 }
 nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
 if (!path) {
 continue;
 if (XRE_IsParentProcess()) {
 SetupTelemetryPref();
 }
-NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID,
+NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, nullptr,
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
 @@ -31,16 +31,20 @@ EXPORTS.mozilla += [
 'StaticPrefs.h',
 with Files('**'):
 BUG_COMPONENT = ('Toolkit', 'Downloads API')
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -68,16 +68,18 @@ toolkit.jar:
+@@ -67,16 +67,18 @@ toolkit.jar:
 content/global/bindings/calendar.js         (widgets/calendar.js)
 content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
 content/global/bindings/datekeeper.js       (widgets/datekeeper.js)
 content/global/bindings/datepicker.js       (widgets/datepicker.js)
 content/global/bindings/datetimepopup.xml   (widgets/datetimepopup.xml)
 content/global/bindings/datetimebox.css     (widgets/datetimebox.css)
 *  content/global/bindings/dialog.xml          (widgets/dialog.xml)
 +*  content/global/bindings/dialog-kde.xml      (widgets/dialog-kde.xml)
 +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
 content/global/bindings/general.xml         (widgets/general.xml)
-content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
 content/global/bindings/menu.xml            (widgets/menu.xml)
 content/global/bindings/menulist.xml        (widgets/menulist.xml)
 content/global/bindings/notification.xml    (widgets/notification.xml)
 content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
 content/global/bindings/popup.xml           (widgets/popup.xml)
 content/global/bindings/radio.xml           (widgets/radio.xml)
+content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,475 @@
+@@ -0,0 +1,477 @@
 +<?xml version="1.0"?>
 +<!-- This Source Code Form is subject to the terms of the Mozilla Public
 +   - License, v. 2.0. If a copy of the MPL was not distributed with this
 +   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 +
 +              } else if (dlgtype != "extra1" && dlgtype != "extra2") {
 +                button.setAttribute("label", this.mStrBundle.GetStringFromName("button-" + dlgtype));
 +                var accessKey = this.mStrBundle.GetStringFromName("accesskey-" + dlgtype);
 +                if (accessKey)
 +                  button.setAttribute("accesskey", accessKey);
++              } else if (this.hasAttribute("buttonid" + dlgtype)) {
++                document.l10n.setAttributes(button, this.getAttribute("buttonid" + dlgtype));
 +              }
 +            }
 +            // allow specifying alternate icons in the dialog header
 +            if (!button.hasAttribute("icon")) {
 +              // if there's an icon specified, use that
 +
 +</bindings>
 diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
 --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
 +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
-@@ -1031,30 +1031,60 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1030,30 +1030,60 @@ nsUnknownContentTypeDialog.prototype = {
 if (params.handlerApp &&
 params.handlerApp.executable &&
 params.handlerApp.executable.isFile()) {
 // Remember the file they chose to run.
 #include "mozilla/Attributes.h"
 #include "nsIURI.h"
 +#include "nsKDEUtils.h"
 class nsUnixSystemProxySettings final : public nsISystemProxySettings {
 public:
 NS_DECL_ISUPPORTS
 NS_DECL_NSISYSTEMPROXYSETTINGS
-nsUnixSystemProxySettings()
+nsUnixSystemProxySettings() : mSchemeProxySettings(4) {}
-: mSchemeProxySettings(4)
+nsresult Init();
-@@ -39,16 +40,17 @@ private:
+@@ -42,16 +43,18 @@ class nsUnixSystemProxySettings final :
-nsCOMPtr<nsIGSettingsService> mGSettings;
+nsACString& aResult);
-nsCOMPtr<nsIGSettingsCollection> mProxySettings;
+nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost,
-nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
+int32_t aPort, nsACString& aResult);
-bool IsProxyMode(const char* aMode);
+nsresult GetProxyFromGSettings(const nsACString& aScheme,
-nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult);
+const nsACString& aHost, int32_t aPort,
-nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
+nsACString& aResult);
-nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
+nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType,
-nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
+nsACString& aResult);
-+  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
++  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost,
++                           PRInt32 aPort, nsACString& aResult);
 };
 NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)
 NS_IMETHODIMP
-nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
+nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
-{
+// dbus prevents us from being threadsafe, but this routine should not block
-// dbus prevents us from being threadsafe, but this routine should not block anyhow
+// anyhow
-@@ -505,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG
+@@ -488,16 +491,19 @@ nsresult nsUnixSystemProxySettings::GetP
+return NS_OK;
-nsresult
+}
-nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
-const nsACString & aScheme,
+nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,
-const nsACString & aHost,
+const nsACString& aScheme,
-const int32_t      aPort,
+const nsACString& aHost,
-nsACString & aResult)
+const int32_t aPort,
-{
+nsACString& aResult) {
 +  if (nsKDEUtils::kdeSupport())
 +    return GetProxyFromKDE(aScheme, aHost, aPort, aResult);
 +
 if (mProxySettings) {
 nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
-if (NS_SUCCEEDED(rv))
+if (NS_SUCCEEDED(rv)) return rv;
-return rv;
 }
-if (mGConf)
+if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
-return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
+return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);
-@@ -540,8 +545,34 @@ static const mozilla::Module::ContractID
+}
+@@ -521,8 +527,34 @@ static const mozilla::Module::CIDEntry k
+static const mozilla::Module::ContractIDEntry kUnixProxyContracts[] = {
+{NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_UNIXSYSTEMPROXYSERVICE_CID},
+{nullptr}};
 static const mozilla::Module kUnixProxyModule = {
-mozilla::Module::kVersion,
+mozilla::Module::kVersion, kUnixProxyCIDs, kUnixProxyContracts};
-kUnixProxyCIDs,
-kUnixProxyContracts
-};
 NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
 +
 +nsresult
 +nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,
 +}
 +
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -68,17 +68,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -73,17 +73,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
 '../components/printingui',
 ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
 UNIFIED_SOURCES += [
 'nsNativeAppSupportDefault.cpp',
 #ifdef MOZ_WIDGET_GTK
 -#include "unix/nsGNOMERegistry.h"
 +#include "unix/nsCommonRegistry.h"
 #endif
+using mozilla::dom::ContentHandlerService;
+using mozilla::dom::HandlerApp;
 using mozilla::dom::HandlerInfo;
-using mozilla::dom::HandlerApp;
-using mozilla::dom::ContentHandlerService;
 using mozilla::dom::RemoteHandlerApp;
 namespace {
-@@ -265,17 +265,17 @@ HandlerServiceParent::RecvExists(const H
+@@ -246,17 +246,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+handlerSvc->Exists(info, exists);
+return IPC_OK();
 }
-mozilla::ipc::IPCResult
+mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocol(
-HandlerServiceParent::RecvExistsForProtocol(const nsCString& aProtocolScheme,
+const nsCString& aProtocolScheme, bool* aHandlerExists) {
-bool* aHandlerExists)
-{
 #ifdef MOZ_WIDGET_GTK
 // Check the GNOME registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme.get());
 +  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme.get());
 #else
 *aHandlerExists = false;
 #endif
 return IPC_OK();
 }
-mozilla::ipc::IPCResult
+mozilla::ipc::IPCResult HandlerServiceParent::RecvGetTypeFromExtension(
-HandlerServiceParent::RecvGetTypeFromExtension(const nsCString& aFileExtension,
+const nsCString& aFileExtension, nsCString* type) {
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
 @@ -76,17 +76,19 @@ else:
 SOURCES += [
 +
 +#endif //nsKDERegistry_h__
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -1,50 +1,53 @@
+@@ -1,47 +1,50 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #endif
 +#if defined(XP_UNIX) && !defined(XP_MACOSX)
 +#include "nsKDEUtils.h"
 +#endif
-nsresult
+nsresult nsMIMEInfoUnix::LoadUriInternal(nsIURI *aURI) {
-nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
-{
 -  return nsGNOMERegistry::LoadURL(aURI);
 +  return nsCommonRegistry::LoadURL(aURI);
 }
 NS_IMETHODIMP
-nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval)
+nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval) {
-{
 // if mDefaultApplication is set, it means the application has been set from
 // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
 // give the GNOME answer.
-if (mDefaultApplication)
+if (mDefaultApplication) return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
-return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
 *_retval = false;
 if (mClass == eProtocolInfo) {
 -    *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
 +    *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get());
 } else {
--    RefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
+RefPtr<nsMIMEInfoBase> mimeInfo =
-+    RefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
+-        nsGNOMERegistry::GetFromType(mSchemeOrType);
++        nsCommonRegistry::GetFromType(mSchemeOrType);
 if (!mimeInfo) {
 nsAutoCString ext;
 nsresult rv = GetPrimaryExtension(ext);
 if (NS_SUCCEEDED(rv)) {
 -        mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
 +        mimeInfo = nsCommonRegistry::GetFromExtension(ext);
 }
 }
-if (mimeInfo)
+if (mimeInfo) *_retval = true;
-*_retval = true;
 }
-if (*_retval)
+if (*_retval) return NS_OK;
-return NS_OK;
-@@ -59,16 +62,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+return NS_OK;
+@@ -51,16 +54,33 @@ nsresult nsMIMEInfoUnix::LaunchDefaultWi
+// if mDefaultApplication is set, it means the application has been set from
 // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
 // give the GNOME answer.
-if (mDefaultApplication)
+if (mDefaultApplication) return nsMIMEInfoImpl::LaunchDefaultWithFile(aFile);
-return nsMIMEInfoImpl::LaunchDefaultWithFile(aFile);
 nsAutoCString nativePath;
 aFile->GetNativePath(nativePath);
 +  if( nsKDEUtils::kdeSupport()) {
 return NS_ERROR_FAILURE;
 }
 // nsGIOMimeApp->Launch wants a URI string instead of local file
 nsresult rv;
-nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
+nsCOMPtr<nsIIOService> ioservice =
 diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 @@ -5,17 +5,17 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsIURL.h"
 #include "nsIFileStreams.h"
 #include "nsILineInputStream.h"
-@@ -1122,17 +1122,17 @@ nsOSHelperAppService::GetHandlerAndDescr
+@@ -1031,17 +1031,17 @@ nsresult nsOSHelperAppService::GetHandle
-nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char * aProtocolScheme, bool * aHandlerExists)
+nsresult nsOSHelperAppService::OSProtocolHandlerExists(
-{
+const char* aProtocolScheme, bool* aHandlerExists) {
 nsresult rv = NS_OK;
 if (!XRE_IsContentProcess()) {
 #ifdef MOZ_WIDGET_GTK
 // Check the GNOME registry for a protocol handler
 #else
 *aHandlerExists = false;
 #endif
 } else {
 *aHandlerExists = false;
-nsCOMPtr<nsIHandlerService> handlerSvc = do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
+nsCOMPtr<nsIHandlerService> handlerSvc =
+do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
 if (NS_SUCCEEDED(rv) && handlerSvc) {
-rv = handlerSvc->ExistsForProtocol(nsCString(aProtocolScheme), aHandlerExists);
+@@ -1051,17 +1051,17 @@ nsresult nsOSHelperAppService::OSProtoco
-@@ -1140,17 +1140,17 @@ nsresult nsOSHelperAppService::OSProtoco
 }
 return rv;
 }
-NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval)
+NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(
-{
+const nsACString& aScheme, nsAString& _retval) {
 #ifdef MOZ_WIDGET_GTK
 -  nsGNOMERegistry::GetAppDescForScheme(aScheme, _retval);
 +  nsCommonRegistry::GetAppDescForScheme(aScheme, _retval);
 return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK;
 #else
 return NS_ERROR_NOT_AVAILABLE;
 #endif
 }
-nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
+nsresult nsOSHelperAppService::GetFileTokenForPath(
-{
+const char16_t* platformAppPath, nsIFile** aFile) {
-@@ -1237,17 +1237,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1142,17 +1142,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
-mime_types_description,
+nsresult rv =
-true);
+LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
+minorType, mime_types_description, true);
 if (NS_FAILED(rv) || majorType.IsEmpty()) {
 #ifdef MOZ_WIDGET_GTK
 LOG(("Looking in GNOME registry\n"));
 RefPtr<nsMIMEInfoBase> gnomeInfo =
--      nsGNOMERegistry::GetFromExtension(aFileExt);
+-        nsGNOMERegistry::GetFromExtension(aFileExt);
-+      nsCommonRegistry::GetFromExtension(aFileExt);
++        nsCommonRegistry::GetFromExtension(aFileExt);
 if (gnomeInfo) {
 LOG(("Got MIMEInfo from GNOME registry\n"));
 return gnomeInfo.forget();
 }
 #endif
-rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
+rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
-majorType,
+minorType, mime_types_description, false);
-@@ -1358,17 +1358,17 @@ nsOSHelperAppService::GetFromType(const
+@@ -1254,17 +1254,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+// Now look up our extensions
 nsAutoString extensions, mime_types_description;
-LookUpExtensionsAndDescription(majorType,
+LookUpExtensionsAndDescription(majorType, minorType, extensions,
-minorType,
-extensions,
 mime_types_description);
 #ifdef MOZ_WIDGET_GTK
 if (handler.IsEmpty()) {
 -    RefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
 +    RefPtr<nsMIMEInfoBase> gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
 if (gnomeInfo) {
-LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "
+LOG(
-"to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));
+("Got MIMEInfo from GNOME registry without extensions; setting them "
+"to %s\n",
+NS_LossyConvertUTF16toASCII(extensions).get()));
 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
-return gnomeInfo.forget();
-}
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -123,16 +123,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -116,16 +116,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '/layout/base',
 #define MAX_PREVIEW_SIZE 180
 // bug 1184009
 #define MAX_PREVIEW_SOURCE_SIZE 4096
 nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
-@@ -246,17 +248,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -227,17 +229,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+mAllowURLs = !!(aFilterMask & filterAllowURLs);
 return nsBaseFilePicker::AppendFilters(aFilterMask);
 }
 NS_IMETHODIMP
-nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter)
+nsFilePicker::AppendFilter(const nsAString &aTitle, const nsAString &aFilter) {
-{
 if (aFilter.EqualsLiteral("..apps")) {
 // No platform specific thing we can do here, really....
 -    return NS_OK;
 +    // Unless it's KDE.
 +    if( mMode != modeOpen || !nsKDEUtils::kdeSupport())
 CopyUTF16toUTF8(aFilter, filter);
 CopyUTF16toUTF8(aTitle, name);
 mFilters.AppendElement(filter);
 mFilterNames.AppendElement(name);
-@@ -371,16 +375,39 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -337,16 +341,39 @@ nsresult nsFilePicker::Show(int16_t *aRe
+return NS_OK;
+}
 NS_IMETHODIMP
-nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
+nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) {
-{
 // Can't show two dialogs concurrently with the same filepicker
-if (mRunning)
+if (mRunning) return NS_ERROR_NOT_AVAILABLE;
-return NS_ERROR_NOT_AVAILABLE;
 +  // KDE file picker is not handled via callback
 +  if( nsKDEUtils::kdeSupport()) {
 +    mCallback = aCallback;
 +    mRunning = true;
 +
 nsCString title;
 title.Adopt(ToNewUTF8String(mTitle));
 GtkWindow *parent_widget =
 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
 GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-@@ -600,16 +627,241 @@ nsFilePicker::Done(void* file_chooser, g
+@@ -571,16 +598,240 @@ void nsFilePicker::Done(void *file_choos
 mCallback->Done(result);
 mCallback = nullptr;
 } else {
 mResult = result;
 }
 +        *aReturn = nsIFilePicker::returnCancel;
 +        }
 +    return NS_OK;
 +    }
 +
-+
 // All below functions available as of GTK 3.20+
+void *nsFilePicker::GtkFileChooserNew(const gchar *title, GtkWindow *parent,
-void *
+GtkFileChooserAction action,
-nsFilePicker::GtkFileChooserNew(
+const gchar *accept_label) {
-const gchar *title, GtkWindow *parent,
+static auto sGtkFileChooserNativeNewPtr =
-GtkFileChooserAction action,
+(void *(*)(const gchar *, GtkWindow *, GtkFileChooserAction,
-const gchar *accept_label)
+const gchar *,
-{
+const gchar *))dlsym(RTLD_DEFAULT,
 diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
 --- a/widget/gtk/nsFilePicker.h
 +++ b/widget/gtk/nsFilePicker.h
-@@ -69,16 +69,22 @@ protected:
+@@ -67,16 +67,22 @@ class nsFilePicker : public nsBaseFilePi
-nsString  mDefaultExtension;
+nsString mDefaultExtension;
 nsTArray<nsCString> mFilters;
 nsTArray<nsCString> mFilterNames;
 private:
 static nsIFile *mPrevDisplayDirectory;
 +  bool kdeRunning();
 +  bool getKdeRunning();
 +  NS_IMETHODIMP kdeFileDialog(PRInt16 *aReturn);
 +  NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn);
 +  nsCString kdeMakeFilter( int index );
 +
-void *GtkFileChooserNew(
+void *GtkFileChooserNew(const gchar *title, GtkWindow *parent,
-const gchar *title, GtkWindow *parent,
+GtkFileChooserAction action,
-GtkFileChooserAction action,
+const gchar *accept_label);
-const gchar *accept_label);
 void GtkFileChooserShow(void *file_chooser);
 void GtkFileChooserDestroy(void *file_chooser);
-void GtkFileChooserSetModal(void *file_chooser, GtkWindow* parent_widget,
+void GtkFileChooserSetModal(void *file_chooser, GtkWindow *parent_widget,
 gboolean modal);
 diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
 --- a/xpcom/components/ManifestParser.cpp
 +++ b/xpcom/components/ManifestParser.cpp
 @@ -33,16 +33,17 @@
 #include "nsTextFormatter.h"
 #include "nsIXULRuntime.h"
 +#include "nsKDEUtils.h"
 using namespace mozilla;
-struct ManifestDirective
+struct ManifestDirective {
-{
 const char* directive;
 int argc;
-@@ -421,16 +422,17 @@ ParseManifest(NSLocationType aType, File
+bool ischrome;
+@@ -392,16 +393,17 @@ void ParseManifest(NSLocationType aType,
 NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
 NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
 NS_NAMED_LITERAL_STRING(kApplication, "application");
 NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
 NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
 #endif
 NS_NAMED_LITERAL_STRING(kMain, "main");
 NS_NAMED_LITERAL_STRING(kContent, "content");
-@@ -476,44 +478,49 @@ ParseManifest(NSLocationType aType, File
+@@ -447,39 +449,44 @@ void ParseManifest(NSLocationType aType,
 CopyUTF8toUTF16(s, abi);
 abi.Insert(char16_t('_'), 0);
 abi.Insert(osTarget, 0);
 }
 }
 nsAutoString osVersion;
 +  nsAutoString desktop;
 #if defined(XP_WIN)
 #pragma warning(push)
-#pragma warning(disable:4996) // VC12+ deprecates GetVersionEx
+#pragma warning(disable : 4996)  // VC12+ deprecates GetVersionEx
-OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
+OSVERSIONINFO info = {sizeof(OSVERSIONINFO)};
 if (GetVersionEx(&info)) {
-nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
+nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", info.dwMajorVersion,
-info.dwMajorVersion,
 info.dwMinorVersion);
 }
 +  desktop = NS_LITERAL_STRING("win");
 #pragma warning(pop)
 #elif defined(MOZ_WIDGET_COCOA)
 SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
 SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
-nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
+nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", majorVersion, minorVersion);
-majorVersion,
-minorVersion);
 +  desktop = NS_LITERAL_STRING("macosx");
 #elif defined(MOZ_WIDGET_GTK)
-nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
+nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", gtk_major_version,
-gtk_major_version,
 gtk_minor_version);
 +  desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome");
 #elif defined(MOZ_WIDGET_ANDROID)
 bool isTablet = false;
 if (mozilla::AndroidBridge::Bridge()) {
-mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION",
+mozilla::AndroidBridge::Bridge()->GetStaticStringField(
-"RELEASE",
+"android/os/Build$VERSION", "RELEASE", osVersion);
-osVersion);
 isTablet = java::GeckoAppShell::IsTablet();
 }
 +  desktop = NS_LITERAL_STRING("android");
 #endif
 process = kContent;
 } else {
 process = kMain;
 }
-@@ -600,25 +607,27 @@ ParseManifest(NSLocationType aType, File
+@@ -566,25 +573,27 @@ void ParseManifest(NSLocationType aType,
 TriState stOsVersion = eUnspecified;
 TriState stOs = eUnspecified;
 TriState stABI = eUnspecified;
 TriState stProcess = eUnspecified;
 #if defined(MOZ_WIDGET_ANDROID)
 CheckStringFlag(kABI, wtoken, abi, stABI) ||
 +          CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||
 CheckStringFlag(kProcess, wtoken, process, stProcess) ||
 CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
 CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
-CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
+CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion,
+stGeckoVersion)) {
 continue;
 }
-#if defined(MOZ_WIDGET_ANDROID)
+@@ -621,17 +630,17 @@ void ParseManifest(NSLocationType aType,
-@@ -663,16 +672,17 @@ ParseManifest(NSLocationType aType, File
+}
+LogMessageWithContext(
+aFile, line, "Unrecognized chrome manifest modifier '%s'.", token);
+ok = false;
 }
-if (!ok ||
+if (!ok || stApp == eBad || stAppVersion == eBad ||
-stApp == eBad ||
+-        stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad ||
-stAppVersion == eBad ||
++        stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad || stDesktop == eBad ||
-stGeckoVersion == eBad ||
-stOs == eBad ||
-stOsVersion == eBad ||
-+        stDesktop == eBad ||
 #ifdef MOZ_WIDGET_ANDROID
 stTablet == eBad ||
 #endif
-stABI == eBad ||
+stABI == eBad || stProcess == eBad) {
-stProcess == eBad) {
 continue;
 }
+if (directive->regfunc) {
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -43,12 +43,13 @@ FINAL_LIBRARY = 'xul'
+@@ -44,12 +44,13 @@ LOCAL_INCLUDES += [
-LOCAL_INCLUDES += [
 '!..',
 '../base',
 '../build',
 '../ds',
 '/chrome',
+'/js/xpconnect/loader',
+'/layout/build',
 '/modules/libjar',
 +    '/toolkit/xre',
 ]
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -2007,63 +2008,78 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1902,62 +1903,77 @@ nsLocalFile::SetPersistentDescriptor(con
 NS_IMETHODIMP
-nsLocalFile::Reveal()
+nsLocalFile::Reveal() {
-{
 if (!FilePreferences::IsAllowedPath(mPath)) {
 return NS_ERROR_FILE_ACCESS_DENIED;
 }
 #ifdef MOZ_WIDGET_GTK
 +
 +  return giovfs->ShowURIForInput(url);
 }
 NS_IMETHODIMP
-nsLocalFile::Launch()
+nsLocalFile::Launch() {
-{
 if (!FilePreferences::IsAllowedPath(mPath)) {
 return NS_ERROR_FILE_ACCESS_DENIED;
 }
 #ifdef MOZ_WIDGET_GTK

branch	firefox65
changeset 1085	87f893cf45b9
parent 1082	821cfbe8efcc
child 1089	eca1c1f2fe50