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 4faaad3619f286bd6077754d8e59d339a5142b80 |
6 # Parent 0fd58e0df883086574263e0881e1503cf110562a |
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/in-content/main.js b/browser/components/preferences/in-content/main.js |
14 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
15 --- a/browser/components/preferences/in-content/main.js |
15 --- a/browser/components/preferences/main.js |
16 +++ b/browser/components/preferences/in-content/main.js |
16 +++ b/browser/components/preferences/main.js |
17 @@ -341,16 +341,23 @@ var gMainPane = { |
17 @@ -336,16 +336,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 @@ -1199,16 +1206,27 @@ var gMainPane = { |
41 @@ -1301,16 +1308,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; |
67 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
67 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
68 } |
68 } |
69 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
69 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
70 --- a/browser/components/shell/moz.build |
70 --- a/browser/components/shell/moz.build |
71 +++ b/browser/components/shell/moz.build |
71 +++ b/browser/components/shell/moz.build |
72 @@ -28,16 +28,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco |
72 @@ -34,16 +34,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco |
73 ] |
73 ] |
74 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
74 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
75 XPIDL_SOURCES += [ |
75 XPIDL_SOURCES += [ |
76 'nsIGNOMEShellService.idl', |
76 'nsIGNOMEShellService.idl', |
77 ] |
77 ] |
79 SOURCES += [ |
79 SOURCES += [ |
80 'nsGNOMEShellService.cpp', |
80 'nsGNOMEShellService.cpp', |
81 + 'nsKDEShellService.cpp', |
81 + 'nsKDEShellService.cpp', |
82 + 'nsUnixShellService.cpp', |
82 + 'nsUnixShellService.cpp', |
83 ] |
83 ] |
84 elif CONFIG['OS_ARCH'] == 'WINNT': |
84 if CONFIG['MOZ_ENABLE_DBUS']: |
85 SOURCES += [ |
85 SOURCES += [ |
86 'nsWindowsShellService.cpp', |
86 'nsGNOMEShellDBusHelper.cpp', |
87 ] |
87 'nsGNOMEShellSearchProvider.cpp', |
88 LOCAL_INCLUDES += [ |
88 ] |
89 '../../../other-licenses/nsis/Contrib/CityHash/cityhash', |
89 include('/ipc/chromium/chromium-config.mozbuild') |
90 ] |
90 |
91 diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp |
91 diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp |
92 new file mode 100644 |
92 new file mode 100644 |
93 --- /dev/null |
93 --- /dev/null |
94 +++ b/browser/components/shell/nsKDEShellService.cpp |
94 +++ b/browser/components/shell/nsKDEShellService.cpp |
95 @@ -0,0 +1,103 @@ |
95 @@ -0,0 +1,103 @@ |