mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:63a32fb3b602
+:4b99400f6d17
 # HG changeset patch
-# Parent  989a507ffc5faf9a3bd950c2391a24afa9f463c8
+# Parent  06a62125ffbb15e88dacb486169d8e6a9595bd78
 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
 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 --- a/modules/libpref/Preferences.cpp
 +++ b/modules/libpref/Preferences.cpp
-@@ -77,16 +77,17 @@
+@@ -80,16 +80,17 @@
 #include "nsXPCOMCID.h"
 #include "nsXPCOM.h"
 #include "nsXULAppAPI.h"
 #include "nsZipArchive.h"
 #include "plbase64.h"
 #include "PLDHashTable.h"
 #include "plstr.h"
 #include "prlink.h"
 +#include "nsKDEUtils.h"
+#ifdef MOZ_MEMORY
+#include "mozmemory.h"
+#endif
 #ifdef XP_WIN
 #include "windows.h"
 #endif
+@@ -4932,25 +4933,37 @@ Preferences::InitInitialObjects(bool aIs
-using namespace mozilla;
-#ifdef DEBUG
-@@ -4189,25 +4190,37 @@ Preferences::InitInitialObjects(bool aIs
 // 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.
-@@ -4256,17 +4269,17 @@ Preferences::InitInitialObjects(bool aIs
+@@ -4999,17 +5012,17 @@ Preferences::InitInitialObjects(bool aIs
 }
 nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
 if (!path) {
 continue;
 NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID,
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -29,16 +29,20 @@ EXPORTS.mozilla += [
+@@ -31,16 +31,20 @@ EXPORTS.mozilla += [
-'Preferences.h',
 'StaticPrefs.h',
 ]
 UNIFIED_SOURCES += [
 'Preferences.cpp',
+'SharedPrefMap.cpp',
 ]
 +LOCAL_INCLUDES += [
 +     '/toolkit/xre'
 +]
 +LOCAL_INCLUDES += [
 +    '/toolkit/xre'
 +]
 +
 with Files('**'):
-BUG_COMPONENT = ('Toolkit', 'Download Manager')
+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
-@@ -69,16 +69,18 @@ toolkit.jar:
+@@ -70,16 +70,18 @@ toolkit.jar:
 content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
 content/global/bindings/colorpicker.xml     (widgets/colorpicker.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.xml     (widgets/datetimebox.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/editor.xml          (widgets/editor.xml)
 *  content/global/bindings/findbar.xml         (widgets/findbar.xml)
 content/global/bindings/general.xml         (widgets/general.xml)
 content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
-content/global/bindings/listbox.xml         (widgets/listbox.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)
 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,478 @@
+@@ -0,0 +1,475 @@
 +<?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/. -->
 +
 +          xmlns="http://www.mozilla.org/xbl"
 +          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 +          xmlns:xbl="http://www.mozilla.org/xbl">
 +
 +  <binding id="dialog">
-+    <resources>
-+      <stylesheet src="chrome://global/skin/dialog.css"/>
-+    </resources>
 +    <content>
 +      <xul:vbox class="box-inherit dialog-content-box" flex="1">
 +        <children/>
 +      </xul:vbox>
 +
 +        <xul:spacer anonid="spacer" flex="1"/>
 +        <xul:button dlgtype="cancel" class="dialog-button"/>
 +        <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
 +#elif XP_UNIX
 +                >
-+        <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
++	<xul:button dlgtype="help" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +        <xul:spacer anonid="spacer" flex="1"/>
 +        <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
 +        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="cancel" class="dialog-button"/>
 +
 +</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
-@@ -1035,30 +1035,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.
 +}
 +
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -71,17 +71,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -67,17 +67,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
 '../components/printingui',
 ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
 UNIFIED_SOURCES += [
 'nsNativeAppSupportDefault.cpp',
 mozilla::ipc::IPCResult
 HandlerServiceParent::RecvGetTypeFromExtension(const nsCString& aFileExtension,
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -77,17 +77,19 @@ else:
+@@ -76,17 +76,19 @@ else:
 SOURCES += [
 osdir + '/nsOSHelperAppService.cpp',
 ]
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
 CXXFLAGS += ['-Wno-error=shadow']
 'unix/nsMIMEInfoUnix.cpp',
 ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
 UNIFIED_SOURCES += [
 'android/nsAndroidHandlerApp.cpp',
-'android/nsExternalSharingAppService.cpp',
 'android/nsExternalURLHandlerService.cpp',
 'android/nsMIMEInfoAndroid.cpp',
-@@ -122,16 +124,17 @@ include('/ipc/chromium/chromium-config.m
+]
+@@ -120,16 +122,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '/docshell/base',
 '/dom/base',
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsIURL.h"
 #include "nsIFileStreams.h"
 #include "nsILineInputStream.h"
-@@ -1128,17 +1128,17 @@ nsOSHelperAppService::GetHandlerAndDescr
+@@ -1125,17 +1125,17 @@ nsOSHelperAppService::GetHandlerAndDescr
 nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char * aProtocolScheme, bool * aHandlerExists)
 {
 nsresult rv = NS_OK;
 } else {
 *aHandlerExists = false;
 nsCOMPtr<nsIHandlerService> handlerSvc = do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
 if (NS_SUCCEEDED(rv) && handlerSvc) {
 rv = handlerSvc->ExistsForProtocol(nsCString(aProtocolScheme), aHandlerExists);
-@@ -1146,17 +1146,17 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1143,17 +1143,17 @@ nsresult nsOSHelperAppService::OSProtoco
 }
 return rv;
 }
 #endif
 }
 nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
 {
-@@ -1243,17 +1243,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1240,17 +1240,17 @@ nsOSHelperAppService::GetFromExtension(c
 mime_types_description,
 true);
 if (NS_FAILED(rv) || majorType.IsEmpty()) {
 }
 #endif
 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
 majorType,
-@@ -1364,17 +1364,17 @@ nsOSHelperAppService::GetFromType(const
+@@ -1361,17 +1361,17 @@ nsOSHelperAppService::GetFromType(const
 nsAutoString extensions, mime_types_description;
 LookUpExtensionsAndDescription(majorType,
 minorType,
 extensions,
 mime_types_description);
 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
-@@ -122,16 +122,17 @@ else:
+@@ -123,16 +123,17 @@ include('/ipc/chromium/chromium-config.m
-include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
+'/layout/base',
 '/layout/generic',
 '/layout/xul',
 '/other-licenses/atk-1.0',
 +    '/toolkit/xre',
 '/widget',
 struct ManifestDirective
 {
 const char* directive;
 int argc;
-@@ -437,16 +438,17 @@ ParseManifest(NSLocationType aType, File
+@@ -419,16 +420,17 @@ ParseManifest(NSLocationType aType, File
 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");
-@@ -492,44 +494,49 @@ ParseManifest(NSLocationType aType, File
+@@ -474,44 +476,49 @@ ParseManifest(NSLocationType aType, File
 CopyUTF8toUTF16(s, abi);
 abi.Insert(char16_t('_'), 0);
 abi.Insert(osTarget, 0);
 }
 }
 process = kContent;
 } else {
 process = kMain;
 }
-@@ -631,25 +638,27 @@ ParseManifest(NSLocationType aType, File
+@@ -598,25 +605,27 @@ ParseManifest(NSLocationType aType, File
 TriState stOsVersion = eUnspecified;
 TriState stOs = eUnspecified;
 TriState stABI = eUnspecified;
 TriState stProcess = eUnspecified;
 #if defined(MOZ_WIDGET_ANDROID)
 CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
 continue;
 }
 #if defined(MOZ_WIDGET_ANDROID)
-@@ -694,16 +703,17 @@ ParseManifest(NSLocationType aType, File
+@@ -661,16 +670,17 @@ ParseManifest(NSLocationType aType, File
 }
 if (!ok ||
 stApp == eBad ||
 stAppVersion == eBad ||
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
 @@ -47,16 +47,17 @@
 #include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
-#include "nsISimpleEnumerator.h"
+#include "nsSimpleEnumerator.h"
 #include "private/pprio.h"
 #include "prlink.h"
 #ifdef MOZ_WIDGET_GTK
 #include "nsIGIOService.h"
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1999,63 +2000,78 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -2007,63 +2008,78 @@ nsLocalFile::SetPersistentDescriptor(con
 NS_IMETHODIMP
 nsLocalFile::Reveal()
 {
 if (!FilePreferences::IsAllowedPath(mPath)) {
 return NS_ERROR_FILE_ACCESS_DENIED;

changeset 1074	4b99400f6d17
parent 1067	735b140fb042
child 1082	821cfbe8efcc