--- a/mozilla-kde.patch Thu Oct 24 20:13:14 2013 +0200
+++ b/mozilla-kde.patch Tue Nov 19 18:46:37 2013 +0100
@@ -7,7 +7,7 @@
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
-@@ -49,14 +49,15 @@ endif
+@@ -35,14 +35,15 @@ endif
# Optimizer bug with GCC 3.2.2 on OS/2
ifeq ($(OS_ARCH), OS2)
nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@@ -26,8 +26,7 @@
diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
--- a/modules/libpref/src/Preferences.cpp
+++ b/modules/libpref/src/Preferences.cpp
-@@ -24,16 +24,17 @@
- #include "nsIStringEnumerator.h"
+@@ -26,16 +26,17 @@
#include "nsIZipReader.h"
#include "nsPrefBranch.h"
#include "nsXPIDLString.h"
@@ -35,6 +34,7 @@
#include "nsCOMArray.h"
#include "nsXPCOMCID.h"
#include "nsAutoPtr.h"
+ #include "nsPrintfCString.h"
+#include "nsKDEUtils.h"
#include "nsQuickSort.h"
@@ -44,7 +44,7 @@
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -973,16 +974,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1098,16 +1099,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -79,7 +79,7 @@
return NS_OK;
bool hasMore;
-@@ -998,17 +1017,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1123,17 +1142,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);
-@@ -1102,28 +1121,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1227,28 +1246,40 @@ 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)
@@ -184,16 +184,11 @@
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
-@@ -11,13 +11,15 @@ VPATH = @srcdir@
- include $(DEPTH)/config/autoconf.mk
-
- LIBRARY_NAME = download_s
- LIBXUL_LIBRARY = 1
- FAIL_ON_WARNINGS = 1
+@@ -4,9 +4,10 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
-+
CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
LOCAL_INCLUDES += \
@@ -203,10 +198,10 @@
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
-@@ -38,16 +38,20 @@
-
+@@ -41,16 +41,20 @@
#ifdef XP_WIN
#include <shlobj.h>
+ #include "nsWindowsHelpers.h"
#ifdef DOWNLOAD_SCANNER
#include "nsDownloadScanner.h"
#endif
@@ -224,7 +219,7 @@
#include "AndroidBridge.h"
#endif
-@@ -2609,16 +2613,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2686,16 +2690,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -250,7 +245,7 @@
int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2645,19 +2658,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2722,19 +2735,20 @@ nsDownload::SetState(DownloadState aStat
// retention policy, there's no reason to make the text clickable
// because if it is, they'll click open the download manager and
// the items they downloaded will have been removed.
@@ -265,7 +260,7 @@
}
+ }
- #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2)
+ #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK)
nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
nsCOMPtr<nsIFile> file;
nsAutoString path;
@@ -275,7 +270,7 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -50,29 +50,33 @@ toolkit.jar:
+@@ -53,29 +53,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)
@@ -769,7 +764,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1339 @@
+@@ -0,0 +1,1332 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE bindings [
@@ -1355,14 +1350,15 @@
+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
+#elif XP_UNIX
-+ pack="end">
-+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
-+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
-+ <xul:spacer anonid="spacer" flex="1"/>
-+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
-+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
-+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
-+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
++ pack="end">
++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++ <xul:spacer anonid="spacer" flex="1"/>
++ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
++ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
++ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
++
+#else
+ pack="end">
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@@ -1511,7 +1507,7 @@
+
+ this._selector.selectedItem = document.getAnonymousElementByAttribute(this, "pane", aPaneElement.id);
+ if (!aPaneElement.loaded) {
-+ function OverlayLoadObserver(aPane)
++ let OverlayLoadObserver = function(aPane)
+ {
+ this._pane = aPane;
+ }
@@ -2073,7 +2069,8 @@
+ </handlers>
+ </binding>
+
-+ <binding id="panebutton" extends="chrome://global/content/bindings/radio.xml#radio">
++ <binding id="panebutton" role="xul:listitem"
++ extends="chrome://global/content/bindings/radio.xml#radio">
+ <resources>
+ <stylesheet src="chrome://global/skin/preferences.css"/>
+ </resources>
@@ -2081,15 +2078,6 @@
+ <xul:image class="paneButtonIcon" xbl:inherits="src"/>
+ <xul:label class="paneButtonLabel" xbl:inherits="value=label"/>
+ </content>
-+ <implementation implements="nsIAccessible">
-+ <property name="accessibleType" readonly="true">
-+ <getter>
-+ <![CDATA[
-+ return Components.interfaces.nsIAccessibleProvider.XULListitem;
-+ ]]>
-+ </getter>
-+ </property>
-+ </implementation>
+ </binding>
+
+</bindings>
@@ -2129,9 +2117,9 @@
NS_DECL_ISUPPORTS
NS_DECL_NSISYSTEMPROXYSETTINGS
- nsUnixSystemProxySettings() {}
- nsresult Init();
-@@ -35,16 +37,17 @@ private:
+ nsUnixSystemProxySettings()
+ : mSchemeProxySettings(5)
+@@ -38,16 +40,17 @@ private:
nsCOMPtr<nsIGSettingsService> mGSettings;
nsCOMPtr<nsIGSettingsCollection> mProxySettings;
nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
@@ -2149,7 +2137,7 @@
nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
{
// dbus prevents us from being threadsafe, but this routine should not block anyhow
-@@ -496,16 +499,19 @@ nsUnixSystemProxySettings::GetProxyFromG
+@@ -498,16 +501,19 @@ nsUnixSystemProxySettings::GetProxyFromG
nsresult
nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
@@ -2169,7 +2157,7 @@
if (mGConf)
return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
-@@ -531,8 +537,34 @@ static const mozilla::Module::ContractID
+@@ -533,8 +539,34 @@ static const mozilla::Module::ContractID
static const mozilla::Module kUnixProxyModule = {
mozilla::Module::kVersion,
@@ -2207,7 +2195,7 @@
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
-@@ -38,18 +38,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -44,18 +44,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
'nsNativeAppSupportQt.cpp',
'nsQAppInstance.cpp',
]
@@ -2628,10 +2616,10 @@
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
-@@ -77,9 +77,10 @@ endif
+@@ -45,9 +45,10 @@ ifdef MOZ_ENABLE_DBUS
+ LOCAL_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
endif
- include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
@@ -2642,8 +2630,8 @@
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
-@@ -68,16 +68,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
- pass
+@@ -73,16 +73,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+ ]
else:
CPP_SOURCES += [
'nsOSHelperAppService.cpp',
@@ -2878,7 +2866,7 @@
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
-@@ -16,30 +16,33 @@
+@@ -10,30 +10,33 @@
#include <QString>
#if (MOZ_ENABLE_CONTENTACTION)
#include <contentaction/contentaction.h>
@@ -2907,14 +2895,14 @@
- nsresult rv = nsGNOMERegistry::LoadURL(aURI);
+ nsresult rv = nsCommonRegistry::LoadURL(aURI);
- #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
- if (NS_FAILED(rv)){
- HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr);
- if (action) {
- nsAutoCString spec;
- aURI->GetAsciiSpec(spec);
- if (hildon_uri_open(spec.get(), action, nullptr))
-@@ -67,22 +70,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
+ #ifdef MOZ_WIDGET_QT
+ if (NS_FAILED(rv)) {
+ nsAutoCString spec;
+ aURI->GetAsciiSpec(spec);
+ if (QDesktopServices::openUrl(QUrl(spec.get()))) {
+ rv = NS_OK;
+ }
+@@ -48,22 +51,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
{
// 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
@@ -2939,7 +2927,7 @@
if (*_retval)
return NS_OK;
-@@ -130,16 +133,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
if (action.isValid()) {
action.trigger();
@@ -2973,7 +2961,7 @@
nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> uri;
-@@ -157,17 +177,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -124,17 +144,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
/* Fallback to GnomeVFS */
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
@@ -3014,7 +3002,7 @@
#include "nsXPIDLString.h"
#include "nsIURL.h"
#include "nsIFileStreams.h"
-@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1157,26 +1157,26 @@ nsresult nsOSHelperAppService::OSProtoco
ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
if (action.isValid())
@@ -3025,9 +3013,6 @@
// Check the GConf registry for a protocol handler
- *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
+ *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
- #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
- *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
- #endif
#endif
return NS_OK;
@@ -3046,7 +3031,7 @@
nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
{
-@@ -1266,17 +1266,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c
mime_types_description,
true);
@@ -3065,7 +3050,7 @@
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
majorType,
-@@ -1389,17 +1389,17 @@ nsOSHelperAppService::GetFromType(const
+@@ -1386,17 +1386,17 @@ nsOSHelperAppService::GetFromType(const
#ifdef MOZ_WIDGET_GTK
nsRefPtr<nsMIMEInfoBase> gnomeInfo;
if (handler.IsEmpty()) {
@@ -3087,7 +3072,7 @@
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
-@@ -68,11 +68,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -38,11 +38,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
INCLUDES += \
-I$(srcdir)/../xpwidgets \
@@ -3133,14 +3118,14 @@
#include "nsFilePicker.h"
+#include "nsKDEUtils.h"
- #if (MOZ_PLATFORM_MAEMO == 5)
- #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
- #endif
-
using namespace mozilla;
#define MAX_PREVIEW_SIZE 180
-@@ -232,17 +234,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+
+ nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
+
+ void
+@@ -225,17 +227,19 @@ nsFilePicker::AppendFilters(int32_t aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -3161,7 +3146,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -356,16 +360,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
NS_IMETHODIMP
nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3194,7 +3179,7 @@
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -553,8 +573,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
if (mCallback) {
mCallback->Done(result);
mCallback = nullptr;
@@ -3433,7 +3418,7 @@
diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
--- a/widget/gtk2/nsFilePicker.h
+++ b/widget/gtk2/nsFilePicker.h
-@@ -67,11 +67,17 @@ protected:
+@@ -66,11 +66,17 @@ protected:
nsString mDefault;
nsString mDefaultExtension;
@@ -3454,7 +3439,7 @@
diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
-@@ -23,9 +23,10 @@ LOCAL_INCLUDES = \
+@@ -14,9 +14,10 @@ LOCAL_INCLUDES = \
-I$(topsrcdir)/chrome/src \
-I$(topsrcdir)/modules/libjar \
$(NULL)
@@ -3599,7 +3584,7 @@
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
-@@ -26,17 +26,17 @@ include $(topsrcdir)/config/rules.mk
+@@ -7,9 +7,9 @@ include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifeq ($(OS_ARCH),Linux)
@@ -3610,18 +3595,10 @@
-LOCAL_INCLUDES += -I..
+LOCAL_INCLUDES += -I.. -I$(topsrcdir)/toolkit/xre
-
- ifeq ($(MOZ_PLATFORM_MAEMO),5)
- CFLAGS += $(MOZ_DBUS_CFLAGS)
- CXXFLAGS += $(MOZ_DBUS_CFLAGS)
- endif
-
- ifdef MOZ_PLATFORM_MAEMO
- CFLAGS += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS)
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -50,16 +50,17 @@
+@@ -42,16 +42,17 @@
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
@@ -3639,7 +3616,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1753,44 +1754,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1727,44 +1728,51 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3705,15 +3682,15 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1816,16 +1824,23 @@ nsLocalFile::Launch()
-
- if (nullptr == connection)
- return NS_ERROR_FAILURE;
+@@ -1772,16 +1780,23 @@ nsLocalFile::Reveal()
+ return NS_ERROR_FAILURE;
+ #endif
+ }
- if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)
- return NS_ERROR_FAILURE;
- return NS_OK;
- #else
+ NS_IMETHODIMP
+ nsLocalFile::Launch()
+ {
+ #ifdef MOZ_WIDGET_GTK
+ if( nsKDEUtils::kdeSupport()) {
+ nsTArray<nsCString> command;
+ command.AppendElement( NS_LITERAL_CSTRING("OPEN") );