--- a/mozilla-kde.patch Sun Sep 14 22:15:27 2014 +0200
+++ b/mozilla-kde.patch Sun Sep 14 22:15:34 2014 +0200
@@ -44,7 +44,7 @@
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -1134,16 +1135,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1167,16 +1168,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -79,7 +79,7 @@
return NS_OK;
bool hasMore;
-@@ -1159,17 +1178,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1192,17 +1211,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf;
path->GetNativeLeafName(leaf);
@@ -98,7 +98,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1263,26 +1282,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1296,26 +1315,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)
@@ -268,7 +268,7 @@
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:
+@@ -54,29 +54,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)
@@ -306,7 +306,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,449 @@
+@@ -0,0 +1,455 @@
+<?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
@@ -340,9 +340,9 @@
+ <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" 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"/>
@@ -675,8 +675,14 @@
+ if (!button.disabled) {
+ var noCancel = this._fireButtonEvent(aDlgType);
+ if (noCancel) {
-+ if (aDlgType == "accept" || aDlgType == "cancel")
++ if (aDlgType == "accept" || aDlgType == "cancel") {
++ var closingEvent = new CustomEvent("dialogclosing", {
++ bubbles: true,
++ detail: { button: aDlgType },
++ });
++ this.dispatchEvent(closingEvent);
+ window.close();
++ }
+ }
+ return noCancel;
+ }
@@ -2221,7 +2227,7 @@
'nsNativeAppSupportDefault.cpp',
]
- if CONFIG['MOZ_X11']:
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
new file mode 100644
--- /dev/null
@@ -3092,7 +3098,7 @@
diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
--- a/widget/gtk/Makefile.in
+++ b/widget/gtk/Makefile.in
-@@ -3,11 +3,13 @@
+@@ -3,14 +3,16 @@
# 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/.
@@ -3106,6 +3112,9 @@
CFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
+ ifdef MOZ_ENABLE_DBUS
+ CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
+ endif
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
--- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp