mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:4c248180e576
+:840132a4a9b3
 # HG changeset patch
-# Parent  cafacdb0b7c50666e5dcc927684a23e8733206a5
+# User msirringhaus@suse.de
+# Date 1559294891 -7200
+#      Fri May 31 11:28:11 2019 +0200
+# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
+# Parent  f11c2d7239c0caa4dc74272716d9e30ced1a1ca3
 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
-@@ -4493,25 +4494,37 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+@@ -4507,25 +4508,37 @@ static nsresult pref_ReadDefaultPrefs(co
 // application pref files for backwards compatibility.
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 NS_WARNING("Error parsing application default preferences.");
 }
 // Load jar:$app/omni.jar!/defaults/preferences/*.js
 // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -4559,17 +4572,17 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+@@ -4573,17 +4586,17 @@ static nsresult pref_ReadDefaultPrefs(co
 }
 nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
 if (!path) {
 continue;
 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/menu.xml            (widgets/menu.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)
 content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
 content/global/bindings/spinner.js          (widgets/spinner.js)
 content/global/bindings/tabbox.xml          (widgets/tabbox.xml)
+*  content/global/bindings/textbox.xml         (widgets/textbox.xml)
+content/global/bindings/timekeeper.js       (widgets/timekeeper.js)
 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,507 @@
+@@ -0,0 +1,499 @@
 +<?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/. -->
 +
 +          buttons.cancel = document.getAnonymousElementByAttribute(this, "dlgtype", "cancel");
 +          buttons.extra1 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra1");
 +          buttons.extra2 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra2");
 +          buttons.help = document.getAnonymousElementByAttribute(this, "dlgtype", "help");
 +          buttons.disclosure = document.getAnonymousElementByAttribute(this, "dlgtype", "disclosure");
++
++          for (let button in buttons) {
++            customElements.upgrade(buttons[button]);
++          }
 +
 +          // look for any overriding explicit button elements
 +          var exBtns = this.getElementsByAttribute("dlgtype", "*");
 +          var dlgtype;
 +          var i;
 +        <![CDATA[
 +          var event = document.createEvent("Events");
 +          event.initEvent("dialog" + aDlgType, true, true);
 +
 +          // handle dom event handlers
-+          var noCancel = this.dispatchEvent(event);
++          return this.dispatchEvent(event);
-+
-+          // handle any xml attribute event handlers
-+          var handler = this.getAttribute("ondialog" + aDlgType);
-+          if (handler != "") {
-+            var fn = new Function("event", handler);
-+            var returned = fn(event);
-+            // eslint-disable-next-line mozilla/no-compare-against-boolean-literals
-+            if (returned == false)
-+              noCancel = false;
-+          }
-+
-+          return noCancel;
 +        ]]>
 +        </body>
 +      </method>
 +
 +      <method name="_hitEnter">
 +
 +</bindings>
 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
-@@ -1030,30 +1030,60 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1042,30 +1042,60 @@ nsUnknownContentTypeDialog.prototype = {
 if (params.handlerApp &&
 params.handlerApp.executable &&
 params.handlerApp.executable.isFile()) {
 // Remember the file they chose to run.
 nsIFilePicker.modeOpen);
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -15,16 +15,17 @@
+@@ -14,16 +14,17 @@
 #include "nsPrintfCString.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIGSettingsService.h"
 class nsUnixSystemProxySettings final : public nsISystemProxySettings {
 public:
 NS_DECL_ISUPPORTS
 NS_DECL_NSISYSTEMPROXYSETTINGS
-@@ -44,16 +45,18 @@ class nsUnixSystemProxySettings final :
+@@ -37,16 +38,18 @@ class nsUnixSystemProxySettings final :
-nsACString& aResult);
+nsCOMPtr<nsIGSettingsCollection> mProxySettings;
-nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost,
+nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection>
-int32_t aPort, nsACString& aResult);
+mSchemeProxySettings;
 nsresult GetProxyFromGSettings(const nsACString& aScheme,
 const nsACString& aHost, int32_t aPort,
 nsACString& aResult);
 nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType,
 nsACString& aResult);
 NS_IMETHODIMP
 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
 // dbus prevents us from being threadsafe, but this routine should not block
 // anyhow
-@@ -487,22 +490,51 @@ nsresult nsUnixSystemProxySettings::GetP
+@@ -382,21 +385,50 @@ nsresult nsUnixSystemProxySettings::GetP
 return NS_OK;
 }
 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,
 const nsACString& aScheme,
 +
 if (mProxySettings) {
 nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
 if (NS_SUCCEEDED(rv)) return rv;
 }
-if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
 return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);
 }
 +nsresult
 +static bool getKdeSession()
 +    {
 +    Display* dpy = XOpenDisplay( NULL );
 +    if( dpy == NULL )
 +        return false;
-+    Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", True );
++    Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", true );
 +    bool kde = false;
 +    if( kde_full_session != None )
 +        {
 +        int cnt;
 +        if( Atom* props = XListProperties( dpy, DefaultRootWindow( dpy ), &cnt ))
 +
 +#endif // nsKDEUtils
 diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp
 --- a/uriloader/exthandler/HandlerServiceParent.cpp
 +++ b/uriloader/exthandler/HandlerServiceParent.cpp
-@@ -1,16 +1,16 @@
+@@ -1,17 +1,17 @@
+#include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/Logging.h"
 #include "HandlerServiceParent.h"
 #include "nsIHandlerService.h"
 #include "nsIMIMEInfo.h"
 #include "ContentHandlerService.h"
 using mozilla::dom::HandlerApp;
 using mozilla::dom::HandlerInfo;
 using mozilla::dom::RemoteHandlerApp;
 namespace {
-@@ -246,17 +246,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+@@ -282,17 +282,17 @@ mozilla::ipc::IPCResult HandlerServicePa
-handlerSvc->Exists(info, exists);
+mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
-return IPC_OK();
-}
-mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocol(
 const nsCString& aProtocolScheme, bool* aHandlerExists) {
+if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) {
+*aHandlerExists = false;
+return IPC_OK();
+}
 #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 HandlerServiceParent::RecvGetTypeFromExtension(
+/*
-const nsCString& aFileExtension, nsCString* type) {
+* Check if a handler exists for the provided protocol. Check the datastore
+@@ -311,17 +311,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+nsCOMPtr<nsIExternalProtocolService> protoSvc =
+do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv);
+if (NS_WARN_IF(NS_FAILED(rv))) {
+*aHandlerExists = false;
+return IPC_OK();
+}
+rv = protoSvc->ExternalProtocolHandlerExists(aProtocolScheme.get(),
+aHandlerExists);
+-
++##
+if (NS_WARN_IF(NS_FAILED(rv))) {
+*aHandlerExists = false;
+}
+#else
+MOZ_RELEASE_ASSERT(false, "No implementation on this platform.");
+*aHandlerExists = false;
+#endif
+return IPC_OK();
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -80,17 +80,19 @@ else:
+@@ -83,17 +83,19 @@ else:
 SOURCES += [
 osdir + '/nsOSHelperAppService.cpp',
 ]
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
 CXXFLAGS += ['-Wno-error=shadow']
 UNIFIED_SOURCES += [
 'android/nsAndroidHandlerApp.cpp',
 'android/nsExternalURLHandlerService.cpp',
 'android/nsMIMEInfoAndroid.cpp',
 ]
-@@ -130,16 +132,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -133,16 +135,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '/docshell/base',
 '/dom/base',
 #endif
 +#if defined(XP_UNIX) && !defined(XP_MACOSX)
 +#include "nsKDEUtils.h"
 +#endif
-nsresult nsMIMEInfoUnix::LoadUriInternal(nsIURI *aURI) {
+nsresult 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) return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -121,16 +121,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -124,16 +124,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;
+nsIFile* nsFilePicker::mPrevDisplayDirectory = nullptr;
 @@ -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);
-@@ -337,16 +341,39 @@ nsresult nsFilePicker::Show(int16_t *aRe
+@@ -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) return NS_ERROR_NOT_AVAILABLE;
 +  // KDE file picker is not handled via callback
 +  if( nsKDEUtils::kdeSupport()) {
 +  }
 +
 nsCString title;
 title.Adopt(ToNewUTF8String(mTitle));
-GtkWindow *parent_widget =
+GtkWindow* parent_widget =
 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
 GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-@@ -572,16 +599,240 @@ void nsFilePicker::Done(void *file_choos
+@@ -572,16 +599,240 @@ void nsFilePicker::Done(void* file_choos
 mCallback->Done(result);
 mCallback = nullptr;
 } else {
 mResult = result;
 }
 +        }
 +    return NS_OK;
 +    }
 +
 // All below functions available as of GTK 3.20+
-void *nsFilePicker::GtkFileChooserNew(const gchar *title, GtkWindow *parent,
+void* nsFilePicker::GtkFileChooserNew(const gchar* title, GtkWindow* parent,
 GtkFileChooserAction action,
-const gchar *accept_label) {
+const gchar* accept_label) {
 static auto sGtkFileChooserNativeNewPtr =
-(void *(*)(const gchar *, GtkWindow *, GtkFileChooserAction,
+(void* (*)(const gchar*, GtkWindow*, GtkFileChooserAction, const gchar*,
-const gchar *,
+const gchar*))dlsym(RTLD_DEFAULT,
-const gchar *))dlsym(RTLD_DEFAULT,
+"gtk_file_chooser_native_new");
 diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
 --- a/widget/gtk/nsFilePicker.h
 +++ b/widget/gtk/nsFilePicker.h
 @@ -67,16 +67,22 @@ class nsFilePicker : public nsBaseFilePi
 nsString mDefaultExtension;
 nsTArray<nsCString> mFilters;
 nsTArray<nsCString> mFilterNames;
 private:
-static nsIFile *mPrevDisplayDirectory;
+static nsIFile* mPrevDisplayDirectory;
 +  bool kdeRunning();
 +  bool getKdeRunning();
 +  NS_IMETHODIMP kdeFileDialog(PRInt16 *aReturn);
 +  NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn);
 +  nsCString kdeMakeFilter( int index );
 +
-void *GtkFileChooserNew(const gchar *title, GtkWindow *parent,
+void* GtkFileChooserNew(const gchar* title, GtkWindow* parent,
 GtkFileChooserAction action,
-const gchar *accept_label);
+const gchar* accept_label);
-void GtkFileChooserShow(void *file_chooser);
+void GtkFileChooserShow(void* file_chooser);
-void GtkFileChooserDestroy(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
 struct ManifestDirective {
 const char* directive;
 int argc;
 bool ischrome;
-@@ -392,16 +393,17 @@ void ParseManifest(NSLocationType aType,
+@@ -393,16 +394,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");
-@@ -447,39 +449,44 @@ void ParseManifest(NSLocationType aType,
+@@ -448,39 +450,44 @@ void ParseManifest(NSLocationType aType,
 CopyUTF8toUTF16(s, abi);
 abi.Insert(char16_t('_'), 0);
 abi.Insert(osTarget, 0);
 }
 }
 process = kContent;
 } else {
 process = kMain;
 }
-@@ -566,25 +573,27 @@ void ParseManifest(NSLocationType aType,
+@@ -567,25 +574,27 @@ void ParseManifest(NSLocationType aType,
 TriState stOsVersion = eUnspecified;
 TriState stOs = eUnspecified;
 TriState stABI = eUnspecified;
 TriState stProcess = eUnspecified;
 #if defined(MOZ_WIDGET_ANDROID)
 CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion,
 stGeckoVersion)) {
 continue;
 }
-@@ -621,17 +630,17 @@ void ParseManifest(NSLocationType aType,
+@@ -622,17 +631,17 @@ void ParseManifest(NSLocationType aType,
 }
 LogMessageWithContext(
 aFile, line, "Unrecognized chrome manifest modifier '%s'.", token);
 ok = false;
 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
-@@ -66,14 +66,15 @@ LOCAL_INCLUDES += [
+@@ -66,16 +66,17 @@ LOCAL_INCLUDES += [
 '!..',
 '../base',
 '../build',
 '../ds',
 '/chrome',
 ]
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 CXXFLAGS += CONFIG['TK_CFLAGS']
-include('/ipc/chromium/chromium-config.mozbuild')
+if CONFIG['MOZ_LAYOUT_DEBUGGER']:
+DEFINES['MOZ_LAYOUT_DEBUGGER'] = True
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
 @@ -47,16 +47,17 @@
 #include "prproces.h"

branch	firefox68
changeset 1097	840132a4a9b3
parent 1093	3942c205588b
child 1099	8a3c73e74e65