mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-22 05:33:03 -05:00
update kde patches for 105
This commit is contained in:
ohfp
parent
a2819cd289
commit
e0e373e695
2 changed files with 26 additions and 26 deletions
|
|
@ -3,7 +3,7 @@
|
|||
# Date 1559294891 -7200
|
||||
# Fri May 31 11:28:11 2019 +0200
|
||||
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
|
||||
# Parent 65e96e081f6f4b68d6b7998f4182a3764832c2ce
|
||||
# Parent b8fad36c438a0d20ffe73630e35c17addb4ee57d
|
||||
Description: Add KDE integration to Firefox (toolkit parts)
|
||||
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
|
||||
Author: Lubos Lunak <lunak@suse.com>
|
||||
|
|
@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
|||
#ifdef MOZ_MEMORY
|
||||
# include "mozmemory.h"
|
||||
#endif
|
||||
@@ -4791,16 +4792,27 @@ nsresult Preferences::InitInitialObjects
|
||||
@@ -4823,16 +4824,27 @@ nsresult Preferences::InitInitialObjects
|
||||
"unix.js"
|
||||
# if defined(_AIX)
|
||||
,
|
||||
|
|
@ -59,7 +59,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
|||
|
||||
// Load jar:$app/omni.jar!/defaults/preferences/*.js
|
||||
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
|
||||
@@ -4865,17 +4877,17 @@ nsresult Preferences::InitInitialObjects
|
||||
@@ -4897,17 +4909,17 @@ nsresult Preferences::InitInitialObjects
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
|
||||
|
|
@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
|||
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
|
||||
--- a/modules/libpref/moz.build
|
||||
+++ b/modules/libpref/moz.build
|
||||
@@ -120,16 +120,20 @@ EXPORTS.mozilla += [
|
||||
@@ -121,16 +121,20 @@ EXPORTS.mozilla += [
|
||||
]
|
||||
EXPORTS.mozilla += sorted(["!" + g for g in gen_h])
|
||||
|
||||
|
|
@ -165,7 +165,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
|
|||
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
|
||||
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
|
||||
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
|
||||
@@ -1254,36 +1254,66 @@ nsUnknownContentTypeDialog.prototype = {
|
||||
@@ -1265,36 +1265,66 @@ nsUnknownContentTypeDialog.prototype = {
|
||||
params.handlerApp &&
|
||||
params.handlerApp.executable &&
|
||||
params.handlerApp.executable.isFile()
|
||||
|
|
@ -768,17 +768,17 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
|
|||
using mozilla::dom::RemoteHandlerApp;
|
||||
|
||||
namespace {
|
||||
@@ -299,17 +299,17 @@ mozilla::ipc::IPCResult HandlerServicePa
|
||||
mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
|
||||
const nsCString& aProtocolScheme, bool* aHandlerExists) {
|
||||
@@ -300,17 +300,17 @@ mozilla::ipc::IPCResult HandlerServicePa
|
||||
const nsACString& aProtocolScheme, bool* aHandlerExists) {
|
||||
if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) {
|
||||
*aHandlerExists = false;
|
||||
return IPC_OK();
|
||||
}
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
// Check the GNOME registry for a protocol handler
|
||||
- *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme.get());
|
||||
+ *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme.get());
|
||||
*aHandlerExists =
|
||||
- nsGNOMERegistry::HandlerExists(PromiseFlatCString(aProtocolScheme).get());
|
||||
+ nsCommonRegistry::HandlerExists(PromiseFlatCString(aProtocolScheme).get());
|
||||
#else
|
||||
*aHandlerExists = false;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 8c876f93d73edd6ddae693152639b5090e41f5de Mon Sep 17 00:00:00 2001
|
||||
From 6dee561c5afeb3371295d64a957a6d919bc37c11 Mon Sep 17 00:00:00 2001
|
||||
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
|
||||
Date: Sat, 27 Aug 2022 14:39:44 +0200
|
||||
Date: Wed, 21 Sep 2022 11:26:12 +0200
|
||||
Subject: [PATCH] kde
|
||||
|
||||
---
|
||||
|
|
@ -37,7 +37,7 @@ Subject: [PATCH] kde
|
|||
create mode 100644 uriloader/exthandler/unix/nsKDERegistry.h
|
||||
|
||||
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
||||
index 4a021270e174..251eb32c566e 100644
|
||||
index 5c4b4af67b80..8fefc56b1180 100644
|
||||
--- a/modules/libpref/Preferences.cpp
|
||||
+++ b/modules/libpref/Preferences.cpp
|
||||
@@ -93,6 +93,7 @@
|
||||
|
|
@ -48,7 +48,7 @@ index 4a021270e174..251eb32c566e 100644
|
|||
|
||||
#ifdef DEBUG
|
||||
# include <map>
|
||||
@@ -4796,6 +4797,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
|
||||
@@ -4828,6 +4829,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ index 4a021270e174..251eb32c566e 100644
|
|||
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
|
||||
ArrayLength(specialFiles));
|
||||
if (NS_FAILED(rv)) {
|
||||
@@ -4870,7 +4882,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
|
||||
@@ -4902,7 +4914,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
|
||||
}
|
||||
|
||||
// Do we care if a file provided by this process fails to load?
|
||||
|
|
@ -76,10 +76,10 @@ index 4a021270e174..251eb32c566e 100644
|
|||
}
|
||||
|
||||
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
|
||||
index 1f021d409c51..171d034cc03a 100644
|
||||
index f6e8556d4c8f..c9002ea541c9 100644
|
||||
--- a/modules/libpref/moz.build
|
||||
+++ b/modules/libpref/moz.build
|
||||
@@ -125,6 +125,10 @@ UNIFIED_SOURCES += [
|
||||
@@ -126,6 +126,10 @@ UNIFIED_SOURCES += [
|
||||
"SharedPrefMap.cpp",
|
||||
]
|
||||
|
||||
|
|
@ -129,10 +129,10 @@ index d4172e2d73ad..8bd0577bc535 100644
|
|||
with Files("**"):
|
||||
BUG_COMPONENT = ("Toolkit", "Downloads API")
|
||||
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
|
||||
index 23a7ed4493ad..b00eb7493b39 100644
|
||||
index 9042007f3d57..19b133638658 100644
|
||||
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
|
||||
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
|
||||
@@ -1259,26 +1259,56 @@ nsUnknownContentTypeDialog.prototype = {
|
||||
@@ -1270,26 +1270,56 @@ nsUnknownContentTypeDialog.prototype = {
|
||||
this.chosenApp = params.handlerApp;
|
||||
}
|
||||
} else if ("@mozilla.org/applicationchooser;1" in Cc) {
|
||||
|
|
@ -670,7 +670,7 @@ index 000000000000..c9c1284e294a
|
|||
+
|
||||
+#endif // nsKDEUtils
|
||||
diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp
|
||||
index dbcc95d95646..5f2542a95065 100644
|
||||
index 6eefb48f1316..08dfb1e0c7c7 100644
|
||||
--- a/uriloader/exthandler/HandlerServiceParent.cpp
|
||||
+++ b/uriloader/exthandler/HandlerServiceParent.cpp
|
||||
@@ -12,7 +12,7 @@
|
||||
|
|
@ -682,12 +682,12 @@ index dbcc95d95646..5f2542a95065 100644
|
|||
#endif
|
||||
|
||||
using mozilla::dom::ContentHandlerService;
|
||||
@@ -304,7 +304,7 @@ mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
|
||||
}
|
||||
@@ -305,7 +305,7 @@ mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
// Check the GNOME registry for a protocol handler
|
||||
- *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme.get());
|
||||
+ *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme.get());
|
||||
*aHandlerExists =
|
||||
- nsGNOMERegistry::HandlerExists(PromiseFlatCString(aProtocolScheme).get());
|
||||
+ nsCommonRegistry::HandlerExists(PromiseFlatCString(aProtocolScheme).get());
|
||||
#else
|
||||
*aHandlerExists = false;
|
||||
#endif
|
||||
|
|
@ -1386,7 +1386,7 @@ index 9b3110aa0048..be9d559c7bf4 100644
|
|||
GtkFileChooserAction action,
|
||||
const gchar* accept_label);
|
||||
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
|
||||
index 7812bfd946ef..1b11780ac47b 100644
|
||||
index 6f127896e334..b465ff529ce2 100644
|
||||
--- a/xpcom/components/ManifestParser.cpp
|
||||
+++ b/xpcom/components/ManifestParser.cpp
|
||||
@@ -43,6 +43,7 @@
|
||||
|
|
@ -1525,5 +1525,5 @@ index 918e2b7955c0..54d6b230cf67 100644
|
|||
if (!giovfs) {
|
||||
return NS_ERROR_FAILURE;
|
||||
--
|
||||
2.37.2
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue