mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:cef565f1c325
+:6cb1ac7cd223
 #include "prefapi.h"
 #include "prefread.h"
 #include "prefapi_private_data.h"
-@@ -1113,16 +1114,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1119,16 +1120,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;
-@@ -1138,17 +1157,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1144,17 +1163,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);
-@@ -1242,28 +1261,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1248,26 +1267,38 @@ 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)
 #if defined(VMS)
 , "openvms.js"
 #elif defined(_AIX)
 , "aix.js"
 #endif
-#elif defined(XP_OS2)
-"os2pref.js"
 #elif defined(XP_BEOS)
 "beos.js"
 #endif
 };
 self.base = base
 self.flags = Flags(*flags)
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
-@@ -4,9 +4,10 @@
+@@ -1,9 +1,9 @@
+#
+# 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/.
 include $(topsrcdir)/config/rules.mk
-CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
+CXXFLAGS += $(TK_CFLAGS)
+-
-LOCAL_INCLUDES += \
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
--I$(srcdir)/../protobuf \
-+  -I$(topsrcdir)/toolkit/xre \
-$(NULL)
 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
-@@ -41,16 +41,20 @@
+@@ -42,16 +42,20 @@
 #ifdef XP_WIN
 #include <shlobj.h>
 #include "nsWindowsHelpers.h"
 #ifdef DOWNLOAD_SCANNER
 #include "nsDownloadScanner.h"
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 using namespace mozilla::widget::android;
 #endif
-@@ -2687,16 +2691,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2695,16 +2699,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 // Master pref to control this function.
 bool showTaskbarAlert = true;
 if (pref)
 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
 int64_t goat = PR_Now() - mStartTime;
 showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2724,19 +2737,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2732,19 +2745,20 @@ nsDownload::SetState(DownloadState aStat
 // because if it is, they'll click open the download manager and
 // the items they downloaded will have been removed.
 alerts->ShowAlertNotification(
 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
 message, !removeWhenDone,
 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
-@@ -55,29 +55,33 @@ toolkit.jar:
+@@ -56,29 +56,33 @@ toolkit.jar:
 content/global/viewZoomOverlay.js          (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)
 content/global/bindings/scrollbox.xml       (widgets/scrollbox.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,451 @@
+@@ -0,0 +1,449 @@
 +<?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/. -->
 +
 +      </method>
 +
 +    </implementation>
 +
 +    <handlers>
-+      <handler event="keypress" keycode="VK_ENTER"
-+               group="system" action="this._hitEnter(event);"/>
 +      <handler event="keypress" keycode="VK_RETURN"
 +               group="system" action="this._hitEnter(event);"/>
 +      <handler event="keypress" keycode="VK_ESCAPE" group="system">
 +        if (!event.defaultPrevented)
 +          this.cancelDialog();
 +}
 +
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -45,17 +45,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+GENERATED_SOURCES += [
+'moc_nsNativeAppSupportQt.cpp',
+]
+SOURCES += [
 'nsNativeAppSupportQt.cpp',
 'nsQAppInstance.cpp',
-]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
-SOURCES += [
-'nsNativeAppSupportOS2.cpp',
 ]
 elif CONFIG['MOZ_ENABLE_GTK']:
 +    EXPORTS += ['nsKDEUtils.h']
 UNIFIED_SOURCES += [
 +        'nsKDEUtils.cpp',
 +
 +#endif // nsKDEUtils
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -19,9 +19,10 @@ endif
+@@ -6,9 +6,10 @@
 ifdef MOZ_ENABLE_DBUS
 OS_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
 endif
 include $(topsrcdir)/config/rules.mk
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -81,17 +81,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -80,17 +80,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 else:
 # These files can't be built in unified mode because they force NSPR logging.
 SOURCES += [
 osdir + '/nsOSHelperAppService.cpp',
 ]
 #endif
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -14,9 +14,10 @@ LOCAL_INCLUDES	= \
+@@ -2,9 +2,10 @@
-	-I$(topsrcdir)/chrome/src \
+# This Source Code Form is subject to the terms of the Mozilla Public
-	-I$(topsrcdir)/modules/libjar \
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-	$(NULL)
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 include $(topsrcdir)/config/rules.mk
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS        += $(TK_CFLAGS)
 stABI == eBad)
 continue;
 if (directive->regfunc) {
 if (GeckoProcessType_Default != XRE_GetProcessType())
-diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
---- a/xpcom/io/Makefile.in
-+++ b/xpcom/io/Makefile.in
-@@ -1,8 +1,8 @@
-# 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/.
-MOZILLA_INTERNAL_API = 1
-include $(topsrcdir)/config/rules.mk
--LOCAL_INCLUDES	+= -I..
-+LOCAL_INCLUDES	+= -I.. -I$(topsrcdir)/toolkit/xre
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
 @@ -43,16 +43,17 @@
 #include "nsIDirectoryEnumerator.h"
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1811,46 +1812,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1813,46 +1814,52 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -1858,16 +1865,23 @@ nsLocalFile::Reveal()
+@@ -1860,16 +1867,23 @@ nsLocalFile::Reveal()
 return NS_ERROR_FAILURE;
 #endif
 }
 NS_IMETHODIMP

changeset 718	6cb1ac7cd223
parent 716	cef565f1c325
child 738	f118b88b7d7f
child 741	f3cef88a34e9