1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1559300151 -7200 |
3 # Date 1559300151 -7200 |
4 # Fri May 31 12:55:51 2019 +0200 |
4 # Fri May 31 12:55:51 2019 +0200 |
5 # Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec |
5 # Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec |
6 # Parent 23d64c5753fda6f201477fe1f2f6cf1fb1657ccc |
6 # Parent c9baf1c9eb9359b7968a52157e8892cdd20f2c6d |
7 How to apply this patch: |
7 How to apply this patch: |
8 1. Import and apply it |
8 1. Import and apply it |
9 2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul |
9 2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul |
10 3. Find editBookmarkPanelDoneButton |
10 3. Find editBookmarkPanelDoneButton |
11 4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style) |
11 4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style) |
12 5. hg qrefresh |
12 5. hg qrefresh |
13 |
13 |
14 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
14 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
15 --- a/browser/components/preferences/main.js |
15 --- a/browser/components/preferences/main.js |
16 +++ b/browser/components/preferences/main.js |
16 +++ b/browser/components/preferences/main.js |
17 @@ -353,16 +353,23 @@ var gMainPane = { |
17 @@ -303,16 +303,23 @@ var gMainPane = { |
18 }, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]); |
18 }, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]); |
19 }; |
19 }; |
20 |
20 |
21 window.setTimeout(() => { |
21 window.setTimeout(() => { |
22 window.requestIdleCallback(pollForDefaultBrowser); |
22 window.requestIdleCallback(pollForDefaultBrowser); |
36 let performanceSettingsLink = document.getElementById( |
36 let performanceSettingsLink = document.getElementById( |
37 "performanceSettingsLearnMore" |
37 "performanceSettingsLearnMore" |
38 ); |
38 ); |
39 let performanceSettingsUrl = |
39 let performanceSettingsUrl = |
40 Services.urlFormatter.formatURLPref("app.support.baseURL") + |
40 Services.urlFormatter.formatURLPref("app.support.baseURL") + |
41 @@ -1365,16 +1372,27 @@ var gMainPane = { |
41 @@ -1334,16 +1341,27 @@ var gMainPane = { |
42 this._backoffIndex = 0; |
42 this._backoffIndex = 0; |
43 |
43 |
44 let shellSvc = getShellService(); |
44 let shellSvc = getShellService(); |
45 if (!shellSvc) { |
45 if (!shellSvc) { |
46 return; |
46 return; |
258 + |
258 + |
259 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
259 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
260 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init) |
260 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init) |
261 + |
261 + |
262 +NS_IMETHODIMP |
262 +NS_IMETHODIMP |
263 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) |
263 +nsUnixShellServiceConstructor(REFNSIID aIID, void **aResult) |
264 +{ |
264 +{ |
265 + if( nsKDEUtils::kdeSupport()) |
265 + if( nsKDEUtils::kdeSupport()) |
266 + return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); |
266 + return nsKDEShellServiceConstructor( aIID, aResult ); |
267 + return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); |
267 + return nsGNOMEShellServiceConstructor( aIID, aResult ); |
268 +} |
268 +} |
269 diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h |
269 diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h |
270 new file mode 100644 |
270 new file mode 100644 |
271 --- /dev/null |
271 --- /dev/null |
272 +++ b/browser/components/shell/nsUnixShellService.h |
272 +++ b/browser/components/shell/nsUnixShellService.h |