firefox-kde.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Wed, 25 Oct 2023 11:49:20 +0200
branchfirefox118
changeset 1196 954851a35787
parent 1190 2a24a948b5cf
child 1198 de5582739a05
permissions -rw-r--r--
118.0.2 latest
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
     1
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
     2
From: Martin Sirringhaus <msirringhaus@suse.de>
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
     3
Date: Tue, 8 Aug 2023 16:18:24 +0300
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
     4
Subject: [PATCH] Add KDE integration to Firefox
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
     5
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
     6
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
     7
Bug: https://bugzilla.suse.com/show_bug.cgi?id=170055
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
     8
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1093
diff changeset
     9
How to apply this patch:
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    10
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1093
diff changeset
    11
1. Import and apply it
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1093
diff changeset
    12
2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1093
diff changeset
    13
3. Find editBookmarkPanelDoneButton
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1093
diff changeset
    14
4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1093
diff changeset
    15
5. hg qrefresh
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    16
---
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    17
 browser/components/preferences/main.js        |  18 +++
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    18
 browser/components/shell/moz.build            |   2 +
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    19
 .../components/shell/nsKDEShellService.cpp    | 109 ++++++++++++++++++
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    20
 browser/components/shell/nsKDEShellService.h  |  32 +++++
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    21
 .../components/shell/nsUnixShellService.cpp   |  22 ++++
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    22
 browser/components/shell/nsUnixShellService.h |  15 +++
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    23
 6 files changed, 198 insertions(+)
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    24
 create mode 100644 browser/components/shell/nsKDEShellService.cpp
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    25
 create mode 100644 browser/components/shell/nsKDEShellService.h
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    26
 create mode 100644 browser/components/shell/nsUnixShellService.cpp
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    27
 create mode 100644 browser/components/shell/nsUnixShellService.h
823
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 821
diff changeset
    28
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    29
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    30
index 609b9a9d06178b42b0ba8509500a1b72d8bd3b88..05df0fc6ce279ab6161a3f93450e7296c95a371f 100644
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    31
--- a/browser/components/preferences/main.js
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    32
+++ b/browser/components/preferences/main.js
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    33
@@ -294,6 +294,13 @@ var gMainPane = {
1005
6d716caa6abe 57.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 994
diff changeset
    34
       }, backoffTimes[this._backoffIndex]);
952
8094e6bba260 rebased patches for 53.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 943
diff changeset
    35
     }
985
038d048a3940 Firefox 55.0b13
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 982
diff changeset
    36
 
223
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 221
diff changeset
    37
+    var env = Components.classes["@mozilla.org/process/environment;1"]
985
038d048a3940 Firefox 55.0b13
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 982
diff changeset
    38
+      .getService(Components.interfaces.nsIEnvironment);
223
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 221
diff changeset
    39
+    var kde_session = 0;
956
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 955
diff changeset
    40
+    if (env.get('KDE_FULL_SESSION') == "true") {
985
038d048a3940 Firefox 55.0b13
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 982
diff changeset
    41
+      kde_session = 1;
952
8094e6bba260 rebased patches for 53.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 943
diff changeset
    42
+    }
985
038d048a3940 Firefox 55.0b13
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 982
diff changeset
    43
+
1005
6d716caa6abe 57.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 994
diff changeset
    44
     this.initBrowserContainers();
985
038d048a3940 Firefox 55.0b13
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 982
diff changeset
    45
     this.buildContentProcessCountMenuList();
916
2f9f2e040647 Firefox 47.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 911
diff changeset
    46
 
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    47
@@ -1725,6 +1732,17 @@ var gMainPane = {
1099
8a3c73e74e65 68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    48
       }
935
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    49
       try {
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    50
         shellSvc.setDefaultBrowser(true, false);
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    51
+        if (kde_session == 1) {
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    52
+          var shellObj = Components.classes["@mozilla.org/file/local;1"]
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    53
+            .createInstance(Components.interfaces.nsILocalFile);
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    54
+          shellObj.initWithPath("/usr/bin/kwriteconfig");
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    55
+          var process = Components.classes["@mozilla.org/process/util;1"]
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    56
+            .createInstance(Components.interfaces.nsIProcess);
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    57
+          process.init(shellObj);
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    58
+          var args = ["--file", "kdeglobals", "--group", "General", "--key",
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    59
+              "BrowserApplication", "firefox"];
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    60
+          process.run(false, args, args.length);
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    61
+        }
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    62
       } catch (ex) {
1183
e69790650e3c Firefox 109.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1175
diff changeset
    63
         console.error(ex);
935
9ae2b79d3bb1 prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 932
diff changeset
    64
         return;
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    65
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    66
index eb88cb287dc3f04022b74b978666118bbd5fa6b2..95277533781a7224d108e3c45731a6d9a89ba1a0 100644
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    67
--- a/browser/components/shell/moz.build
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    68
+++ b/browser/components/shell/moz.build
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    69
@@ -36,6 +36,8 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
1089
eca1c1f2fe50 Firefox 66.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1085
diff changeset
    70
 
1057
b70ce330958c successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1055
diff changeset
    71
     SOURCES += [
1152
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1141
diff changeset
    72
         "nsGNOMEShellService.cpp",
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1141
diff changeset
    73
+        "nsKDEShellService.cpp",
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1141
diff changeset
    74
+        "nsUnixShellService.cpp",
659
fa96cf6ffd14 Aurora 24 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 653
diff changeset
    75
     ]
1152
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1141
diff changeset
    76
     if CONFIG["MOZ_ENABLE_DBUS"]:
1127
d5b284f833d5 Firefox 77.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    77
         SOURCES += [
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    78
diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    79
new file mode 100644
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    80
index 0000000000000000000000000000000000000000..152a3aca87ea73477bc75c4e93c01e5a52dda102
1099
8a3c73e74e65 68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    81
--- /dev/null
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
    82
+++ b/browser/components/shell/nsKDEShellService.cpp
1168
c384af864671 Firefox 94.0.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1156
diff changeset
    83
@@ -0,0 +1,109 @@
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    84
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
548
55cd16b450d2 signature update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    85
+/* This Source Code Form is subject to the terms of the Mozilla Public
55cd16b450d2 signature update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    86
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
55cd16b450d2 signature update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    87
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    88
+
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
    89
+#include "mozilla/ArrayUtils.h"
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
    90
+
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
    91
+#include "nsCOMPtr.h"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    92
+#include "nsKDEShellService.h"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    93
+#include "nsShellService.h"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    94
+#include "nsKDEUtils.h"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    95
+#include "nsIPrefService.h"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    96
+#include "nsIProcess.h"
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
    97
+#include "nsIFile.h"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    98
+#include "nsServiceManagerUtils.h"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    99
+#include "nsComponentManagerUtils.h"
398
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   100
+#include "nsIMutableArray.h"
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   101
+#include "nsISupportsPrimitives.h"
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   102
+#include "nsArrayUtils.h"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   103
+
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   104
+using namespace mozilla;
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   105
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   106
+nsresult
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   107
+nsKDEShellService::Init()
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   108
+{
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   109
+    if( !nsKDEUtils::kdeSupport())
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   110
+        return NS_ERROR_NOT_AVAILABLE;
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   111
+    return NS_OK;
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   112
+}
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   113
+
911
32eafb4c7b34 fix interface
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 910
diff changeset
   114
+NS_IMPL_ISUPPORTS(nsKDEShellService, nsIGNOMEShellService, nsIShellService)
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   115
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   116
+NS_IMETHODIMP
1089
eca1c1f2fe50 Firefox 66.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1085
diff changeset
   117
+nsKDEShellService::IsDefaultBrowser(bool aForAllTypes,
367
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   118
+                                    bool* aIsDefaultBrowser)
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   119
+{
398
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   120
+    *aIsDefaultBrowser = false;
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   121
+
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   122
+    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   123
+    if (!command)
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   124
+        return NS_ERROR_FAILURE;
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   125
+
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   126
+    nsCOMPtr<nsISupportsCString> str = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   127
+    if (!str)
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   128
+        return NS_ERROR_FAILURE;
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   129
+
1141
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1127
diff changeset
   130
+    str->SetData("ISDEFAULTBROWSER"_ns);
1021
1307721d2345 fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1020
diff changeset
   131
+    command->AppendElement( str );
398
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   132
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   133
+    if( nsKDEUtils::command( command ))
398
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   134
+        *aIsDefaultBrowser = true;
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   135
+    return NS_OK;
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   136
+}
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   137
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   138
+NS_IMETHODIMP
367
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   139
+nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes,
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   140
+                                     bool aForAllUsers)
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   141
+{
398
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   142
+    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   143
+    if (!command)
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   144
+        return NS_ERROR_FAILURE;
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   145
+
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   146
+    nsCOMPtr<nsISupportsCString> cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   147
+    nsCOMPtr<nsISupportsCString> paramstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   148
+    if (!cmdstr || !paramstr)
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   149
+        return NS_ERROR_FAILURE;
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   150
+
1141
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1127
diff changeset
   151
+    cmdstr->SetData("SETDEFAULTBROWSER"_ns);
1021
1307721d2345 fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1020
diff changeset
   152
+    command->AppendElement( cmdstr );
398
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   153
+
1141
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1127
diff changeset
   154
+    paramstr->SetData( aClaimAllTypes ? "ALLTYPES"_ns : "NORMAL"_ns );
1021
1307721d2345 fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1020
diff changeset
   155
+    command->AppendElement( paramstr );
398
937669e1c537 ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 367
diff changeset
   156
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   157
+    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   158
+}
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   159
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   160
+NS_IMETHODIMP
910
a3615665211f readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 909
diff changeset
   161
+nsKDEShellService::GetCanSetDesktopBackground(bool* aResult)
a3615665211f readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 909
diff changeset
   162
+{
a3615665211f readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 909
diff changeset
   163
+  *aResult = true;
a3615665211f readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 909
diff changeset
   164
+  return NS_OK;
a3615665211f readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 909
diff changeset
   165
+}
a3615665211f readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 909
diff changeset
   166
+
a3615665211f readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 909
diff changeset
   167
+NS_IMETHODIMP
1057
b70ce330958c successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1055
diff changeset
   168
+nsKDEShellService::SetDesktopBackground(dom::Element* aElement,
1007
65e317e42eff fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1006
diff changeset
   169
+                                        int32_t aPosition,
65e317e42eff fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1006
diff changeset
   170
+                                        const nsACString& aImageName)
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   171
+{
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   172
+    return NS_ERROR_NOT_IMPLEMENTED;
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   173
+}
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   174
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   175
+NS_IMETHODIMP
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   176
+nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor)
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   177
+{
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   178
+    return NS_ERROR_NOT_IMPLEMENTED;
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   179
+}
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   180
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   181
+NS_IMETHODIMP
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   182
+nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor)
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   183
+{
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   184
+    return NS_ERROR_NOT_IMPLEMENTED;
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   185
+}
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   186
+
1168
c384af864671 Firefox 94.0.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1156
diff changeset
   187
+NS_IMETHODIMP
c384af864671 Firefox 94.0.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1156
diff changeset
   188
+nsKDEShellService::IsDefaultForScheme(nsTSubstring<char> const& aScheme, bool* aIsDefaultBrowser)
c384af864671 Firefox 94.0.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1156
diff changeset
   189
+{
c384af864671 Firefox 94.0.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1156
diff changeset
   190
+    return NS_ERROR_NOT_IMPLEMENTED;
c384af864671 Firefox 94.0.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1156
diff changeset
   191
+}
c384af864671 Firefox 94.0.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1156
diff changeset
   192
+
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   193
diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   194
new file mode 100644
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   195
index 0000000000000000000000000000000000000000..8b0bb19164352453cfa453dd87c19263160b9ad8
1099
8a3c73e74e65 68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
   196
--- /dev/null
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   197
+++ b/browser/components/shell/nsKDEShellService.h
1089
eca1c1f2fe50 Firefox 66.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1085
diff changeset
   198
@@ -0,0 +1,32 @@
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   199
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
889
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   200
+/* This Source Code Form is subject to the terms of the Mozilla Public
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   201
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   202
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   203
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   204
+#ifndef nskdeshellservice_h____
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   205
+#define nskdeshellservice_h____
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   206
+
911
32eafb4c7b34 fix interface
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 910
diff changeset
   207
+#include "nsIGNOMEShellService.h"
1089
eca1c1f2fe50 Firefox 66.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1085
diff changeset
   208
+#include "nsToolkitShellService.h"
942
66115255ad6f prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 935
diff changeset
   209
+#include "nsString.h"
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   210
+#include "mozilla/Attributes.h"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   211
+
1089
eca1c1f2fe50 Firefox 66.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1085
diff changeset
   212
+class nsKDEShellService final : public nsIGNOMEShellService,
eca1c1f2fe50 Firefox 66.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1085
diff changeset
   213
+                                public nsToolkitShellService
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   214
+{
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   215
+public:
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   216
+  nsKDEShellService() : mCheckedThisSession(false) { }
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   217
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   218
+  NS_DECL_ISUPPORTS
1057
b70ce330958c successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1055
diff changeset
   219
+  NS_DECL_NSISHELLSERVICE
911
32eafb4c7b34 fix interface
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 910
diff changeset
   220
+  NS_DECL_NSIGNOMESHELLSERVICE
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   221
+
889
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   222
+  nsresult Init();
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   223
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   224
+private:
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   225
+  ~nsKDEShellService() {}
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   226
+
739
e178ad08fed6 update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 738
diff changeset
   227
+  bool mCheckedThisSession;
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   228
+};
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   229
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   230
+#endif // nskdeshellservice_h____
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   231
diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   232
new file mode 100644
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   233
index 0000000000000000000000000000000000000000..abf266ebdc52e136f495911da3454e69c770c6db
1099
8a3c73e74e65 68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
   234
--- /dev/null
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   235
+++ b/browser/components/shell/nsUnixShellService.cpp
889
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   236
@@ -0,0 +1,22 @@
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   237
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
889
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   238
+/* This Source Code Form is subject to the terms of the Mozilla Public
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   239
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   240
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   241
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   242
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   243
+#include "nsUnixShellService.h"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   244
+#include "nsGNOMEShellService.h"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   245
+#include "nsKDEShellService.h"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   246
+#include "nsKDEUtils.h"
133
a77c32dc7ffd Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 127
diff changeset
   247
+#include "mozilla/ModuleUtils.h"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   248
+
136
0051f2b9308b Fixed init of Shellservices
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 133
diff changeset
   249
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
0051f2b9308b Fixed init of Shellservices
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 133
diff changeset
   250
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init)
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   251
+
953
6b282f295753 53.0b4 (complete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 952
diff changeset
   252
+NS_IMETHODIMP
1175
4c6576f9cf04 Firefox 102.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1168
diff changeset
   253
+nsUnixShellServiceConstructor(REFNSIID aIID, void **aResult)
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   254
+{
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   255
+    if( nsKDEUtils::kdeSupport())
1175
4c6576f9cf04 Firefox 102.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1168
diff changeset
   256
+        return nsKDEShellServiceConstructor( aIID, aResult );
4c6576f9cf04 Firefox 102.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1168
diff changeset
   257
+    return nsGNOMEShellServiceConstructor( aIID, aResult );
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   258
+}
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   259
diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   260
new file mode 100644
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   261
index 0000000000000000000000000000000000000000..26b5dbac47dd9a8ec1fcb6c93575cca750692735
1099
8a3c73e74e65 68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
   262
--- /dev/null
1196
954851a35787 118.0.2 latest
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1190
diff changeset
   263
+++ b/browser/components/shell/nsUnixShellService.h
889
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   264
@@ -0,0 +1,15 @@
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   265
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
889
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   266
+/* This Source Code Form is subject to the terms of the Mozilla Public
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   267
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   268
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
de3a92aed259 43.0b9 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 885
diff changeset
   269
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   270
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   271
+#ifndef nsunixshellservice_h____
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   272
+#define nsunixshellservice_h____
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   273
+
911
32eafb4c7b34 fix interface
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 910
diff changeset
   274
+#include "nsIGNOMEShellService.h"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   275
+
953
6b282f295753 53.0b4 (complete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 952
diff changeset
   276
+NS_IMETHODIMP
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   277
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   278
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   279
+#endif // nsunixshellservice_h____