mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:3cc9f17ca9bb
+:b61e849fe451
 # HG changeset patch
-# Parent  972c67cdd5dd4463abbee60036b686d4cb78e616
+# Parent  6ff55468281e12a84adefb46b17acb60d9cea608
 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
 #include "prefapi.h"
 #include "prefread.h"
 #include "prefapi_private_data.h"
-@@ -1145,16 +1146,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1180,16 +1181,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
 static nsresult pref_LoadPrefsInDirList(const char *listId)
 {
 nsresult rv;
 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
 getter_AddRefs(list));
 if (!list)
 return NS_OK;
 bool hasMore;
-@@ -1170,17 +1189,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1205,17 +1224,17 @@ static nsresult pref_LoadPrefsInDirList(
 nsAutoCString leaf;
 path->GetNativeLeafName(leaf);
 // Do we care if a file provided by this process fails to load?
 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
 {
 nsZipItemPtr<char> manifest(jarReader, name, true);
 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1274,24 +1293,36 @@ static nsresult pref_InitInitialObjects(
+@@ -1309,24 +1328,36 @@ static nsresult pref_InitInitialObjects(
 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 FINAL_LIBRARY = 'xul'
 DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
 DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
-if CONFIG['GNU_CXX']:
+FINAL_TARGET_PP_FILES += [
 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
 --- a/python/mozbuild/mozpack/chrome/flags.py
 +++ b/python/mozbuild/mozpack/chrome/flags.py
 @@ -211,16 +211,17 @@ class Flags(OrderedDict):
 'contentaccessible': Flag,
 self.base = base
 self.flags = Flags(*flags)
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/toolkit/components/downloads/moz.build
 +++ b/toolkit/components/downloads/moz.build
-@@ -60,15 +60,16 @@ if not CONFIG['MOZ_SUITE']:
+@@ -60,17 +60,18 @@ if not CONFIG['MOZ_SUITE']:
 'nsDownloadManagerUI.js',
 'nsDownloadManagerUI.manifest',
 ]
 FINAL_LIBRARY = 'xul'
 DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
 CXXFLAGS += CONFIG['TK_CFLAGS']
+if CONFIG['GNU_CXX']:
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
 @@ -51,16 +51,20 @@
 #ifdef XP_WIN
 #ifdef XP_MACOSX
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 #ifdef MOZ_WIDGET_ANDROID
-#include "AndroidBridge.h"
+#include "GeneratedJNIWrappers.h"
 #endif
 @@ -2719,16 +2723,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 if (fileURL &&
 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) &&
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -72,29 +72,33 @@ toolkit.jar:
+@@ -67,29 +67,33 @@ toolkit.jar:
 content/global/viewZoomOverlay.js
 content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
 content/global/bindings/browser.xml         (widgets/browser.xml)
 content/global/bindings/button.xml          (widgets/button.xml)
 content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
 +</bindings>
 diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1408 @@
+@@ -0,0 +1,1410 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
 +  <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
 +  %preferencesDTD;
 +            .removeObserver(this.name, this.preferences);
 +      </destructor>
 +      <field name="_constructed">false</field>
 +      <property name="instantApply">
 +        <getter>
++          if (this.getAttribute("instantApply") == "false")
++            return false;
 +          return this.getAttribute("instantApply") == "true" || this.preferences.instantApply;
 +        </getter>
 +      </property>
 +
 +      <property name="preferences" onget="return this.parentNode"/>
 +}
 +
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -48,17 +48,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
+@@ -39,17 +39,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+'updaterfileutils_osx.mm',
-EXPORTS += ['nsQAppInstance.h']
+]
-SOURCES += [
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
-'!moc_nsNativeAppSupportQt.cpp',
+UNIFIED_SOURCES += [
-'nsNativeAppSupportQt.cpp',
+'nsNativeAppSupportDefault.cpp',
-'nsQAppInstance.cpp',
+'UIKitDirProvider.mm',
 ]
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 +    EXPORTS += ['nsKDEUtils.h']
 UNIFIED_SOURCES += [
 +        'nsKDEUtils.cpp',
 +
 +#endif // nsKDEUtils
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -75,17 +75,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
+@@ -77,17 +77,19 @@ else:
-else:
-# These files can't be built in unified mode because they redefine LOG.
 SOURCES += [
 osdir + '/nsOSHelperAppService.cpp',
 ]
+if CONFIG['GNU_CXX']:
+CXXFLAGS += ['-Wno-error=shadow']
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 UNIFIED_SOURCES += [
 +        'unix/nsCommonRegistry.cpp',
 'unix/nsGNOMERegistry.cpp',
-+        'unix/nsKDERegistry.cpp',
++	'unix/nsKDERegistry.cpp',
 'unix/nsMIMEInfoUnix.cpp',
 ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
 UNIFIED_SOURCES += [
 'android/nsAndroidHandlerApp.cpp',
 'android/nsExternalSharingAppService.cpp',
 'android/nsExternalURLHandlerService.cpp',
 'android/nsMIMEInfoAndroid.cpp',
-@@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -123,16 +125,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '/dom/base',
 if CONFIG['MOZ_ENABLE_DBUS']:
 CXXFLAGS += CONFIG['TK_CFLAGS']
 CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
 CXXFLAGS += CONFIG['TK_CFLAGS']
 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
 new file mode 100644
 --- /dev/null
 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp
 +
 +#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
-@@ -7,32 +7,35 @@
+@@ -1,50 +1,53 @@
-#ifdef MOZ_WIDGET_QT
+/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-#if (MOZ_ENABLE_CONTENTACTION)
+*
-#include <contentaction/contentaction.h>
+* This Source Code Form is subject to the terms of the Mozilla Public
-#include "nsContentHandlerApp.h"
+* License, v. 2.0. If a copy of the MPL was not distributed with this
-#endif
+* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#endif
 #include "nsMIMEInfoUnix.h"
 -#include "nsGNOMERegistry.h"
 +#include "nsCommonRegistry.h"
 #include "nsIGIOService.h"
 #include "nsIIOService.h"
 #include "nsAutoPtr.h"
 #ifdef MOZ_ENABLE_DBUS
 #include "nsDBusHandlerApp.h"
 #endif
-#ifdef MOZ_WIDGET_QT
-#include "nsMIMEInfoQt.h"
-#endif
 +#if defined(XP_UNIX) && !defined(XP_MACOSX)
 +#include "nsKDEUtils.h"
 +#endif
 nsresult
 nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
 {
--  nsresult rv = nsGNOMERegistry::LoadURL(aURI);
+-  return nsGNOMERegistry::LoadURL(aURI);
-+  nsresult rv = nsCommonRegistry::LoadURL(aURI);
++  return nsCommonRegistry::LoadURL(aURI);
+}
-#ifdef MOZ_WIDGET_QT
-if (NS_FAILED(rv)) {
+NS_IMETHODIMP
-rv = nsMIMEInfoQt::LoadUriInternal(aURI);
+nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval)
-}
+{
-#endif
+// if mDefaultApplication is set, it means the application has been set from
-return rv;
-@@ -45,24 +48,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
 // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
 // give the GNOME answer.
 if (mDefaultApplication)
 return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
 *_retval = true;
 }
 if (*_retval)
 return NS_OK;
-@@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -79,16 +82,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
 ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
 if (action.isValid()) {
 action.trigger();
 return NS_OK;
 }
 GtkWindow *parent_widget =
 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
 GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -595,8 +615,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -603,8 +623,235 @@ nsFilePicker::Done(GtkWidget* file_choos
 if (mCallback) {
 mCallback->Done(result);
 mCallback = nullptr;
 } else {
 mResult = result;
 #if defined(XP_WIN)
 #pragma warning(push)
 #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx
 OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
 if (GetVersionEx(&info)) {
-nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
+nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
 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, MOZ_UTF16("%ld.%ld"),
+nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
 majorVersion,
 minorVersion);
 +  desktop = NS_LITERAL_STRING("macosx");
 #elif defined(MOZ_WIDGET_GTK)
-nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
+nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
 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",
 "RELEASE",
 osVersion);
-isTablet = mozilla::widget::GeckoAppShell::IsTablet();
+isTablet = java::GeckoAppShell::IsTablet();
 }
 +  desktop = NS_LITERAL_STRING("android");
 #endif
 if (XRE_IsContentProcess()) {
 }
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul'
+@@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '!..',
 '../base',
 '../build',
 '../ds',

changeset 934	b61e849fe451
parent 932	a58cc7936ce7
child 935	9ae2b79d3bb1