Open
[sync] PR-49: fix wifi dialog can not close #79
openeuler-ci-botAdd on 10 days ago
[sync] PR-49: fix wifi dialog can not close #79
Open
Total: 3 files changed+89-1
| @@ -0,0 +1,31 @@ | |||
| 1 | +commit e08a3eec1d99cdc5b37b2f0ef54e22729bb25f7a | ||
| 2 | +Author: NiuTao <niutao2@huawei.com> | ||
| 3 | +Date: Mon Apr 29 11:23:39 2024 +0800 | ||
| 4 | + | ||
| 5 | + change default favorite app | ||
| 6 | + | ||
| 7 | +diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in | ||
| 8 | +index c2f008f..495dd7f 100644 | ||
| 9 | +--- a/data/org.gnome.shell.gschema.xml.in | ||
| 10 | ++++ b/data/org.gnome.shell.gschema.xml.in | ||
| 11 | +@@ -50,7 +50,7 @@ | ||
| 12 | + </description> | ||
| 13 | + </key> | ||
| 14 | + <key name="favorite-apps" type="as"> | ||
| 15 | +- <default>[ 'firefox.desktop', 'org.gnome.Calendar.desktop', 'rhythmbox.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> | ||
| 16 | ++ <default>[ 'code.desktop', 'org.gnome.Terminal.desktop', 'firefox.desktop' ]</default> | ||
| 17 | + <summary>List of desktop file IDs for favorite applications</summary> | ||
| 18 | + <description> | ||
| 19 | + The applications corresponding to these identifiers | ||
| 20 | +diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js | ||
| 21 | +index 24ce16f..04c015c 100644 | ||
| 22 | +--- a/js/ui/appFavorites.js | ||
| 23 | ++++ b/js/ui/appFavorites.js | ||
| 24 | +@@ -11,6 +11,7 @@ const Main = imports.ui.main; | ||
| 25 | + const RENAMED_DESKTOP_IDS = { | ||
| 26 | + 'baobab.desktop': 'org.gnome.baobab.desktop', | ||
| 27 | + 'cheese.desktop': 'org.gnome.Cheese.desktop', | ||
| 28 | ++ 'code.desktop': 'code.desktop', | ||
| 29 | + 'dconf-editor.desktop': 'ca.desrt.dconf-editor.desktop', | ||
| 30 | + 'empathy.desktop': 'org.gnome.Empathy.desktop', | ||
| 31 | + 'eog.desktop': 'org.gnome.eog.desktop', | ||
| @@ -0,0 +1,49 @@ | |||
| 1 | +commit 0890a7405c6e579d6b81520d00b899fda6fe9009 | ||
| 2 | +Author: NiuTao <niutao2@huawei.com> | ||
| 3 | +Date: Mon Apr 29 10:12:36 2024 +0800 | ||
| 4 | + | ||
| 5 | + fix wifi dialog can not close | ||
| 6 | + | ||
| 7 | +diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js | ||
| 8 | +index caa8744..23bcd27 100644 | ||
| 9 | +--- a/js/ui/modalDialog.js | ||
| 10 | ++++ b/js/ui/modalDialog.js | ||
| 11 | +@@ -202,7 +202,7 @@ var ModalDialog = GObject.registerClass({ | ||
| 12 | + this._savedKeyFocus = focus; | ||
| 13 | + else | ||
| 14 | + this._savedKeyFocus = null; | ||
| 15 | +- Main.popModal(this, timestamp); | ||
| 16 | ++ Main.popModal(this); | ||
| 17 | + this._hasModal = false; | ||
| 18 | + | ||
| 19 | + if (!this._shellReactive) | ||
| 20 | +@@ -214,8 +214,6 @@ var ModalDialog = GObject.registerClass({ | ||
| 21 | + return true; | ||
| 22 | + | ||
| 23 | + let params = { actionMode: this._actionMode }; | ||
| 24 | +- if (timestamp) | ||
| 25 | +- params['timestamp'] = timestamp; | ||
| 26 | + if (!Main.pushModal(this, params)) | ||
| 27 | + return false; | ||
| 28 | + | ||
| 29 | +diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js | ||
| 30 | +index 4f461f3..b686b9e 100644 | ||
| 31 | +--- a/js/ui/unlockDialog.js | ||
| 32 | ++++ b/js/ui/unlockDialog.js | ||
| 33 | +@@ -877,7 +877,6 @@ var UnlockDialog = GObject.registerClass({ | ||
| 34 | + return true; | ||
| 35 | + | ||
| 36 | + let modalParams = { | ||
| 37 | +- timestamp, | ||
| 38 | + actionMode: Shell.ActionMode.UNLOCK_SCREEN, | ||
| 39 | + }; | ||
| 40 | + if (!Main.pushModal(this, modalParams)) | ||
| 41 | +@@ -894,7 +893,7 @@ var UnlockDialog = GObject.registerClass({ | ||
| 42 | + | ||
| 43 | + popModal(timestamp) { | ||
| 44 | + if (this._isModal) { | ||
| 45 | +- Main.popModal(this, timestamp); | ||
| 46 | ++ Main.popModal(this); | ||
| 47 | + this._isModal = false; | ||
| 48 | + } | ||
| 49 | + } | ||
| @@ -1,6 +1,6 @@ | |||
| 1 | Name: gnome-shell | 1 | Name: gnome-shell |
| 2 | Version: 3.38.4 | 2 | Version: 3.38.4 |
| 3 | -Release: 4 | 3 | +Release: 6 |
| 4 | Summary: Core user interface functions for the GNOME 3 desktop | 4 | Summary: Core user interface functions for the GNOME 3 desktop |
| 5 | Group: User Interface/Desktops | 5 | Group: User Interface/Desktops |
| 6 | License: GPLv2+ | 6 | License: GPLv2+ |
| @@ -8,6 +8,8 @@ URL: https://wiki.gnome.org/Projects/GnomeShell | |||
| 8 | Source0: http://download.gnome.org/sources/gnome-shell/3.38/%{name}-%{version}.tar.xz | 8 | Source0: http://download.gnome.org/sources/gnome-shell/3.38/%{name}-%{version}.tar.xz |
| 9 | 9 | ||
| 10 | Patch1: gnome-shell-favourite-apps-firefox.patch | 10 | Patch1: gnome-shell-favourite-apps-firefox.patch |
| 11 | +Patch2: gnome-shell-fix-wifi-dialog-can-not-close.patch | ||
| 12 | +Patch3: gnome-shell-change-default-favorite-app.patch | ||
| 11 | 13 | ||
| 12 | BuildRequires: meson ibus-devel chrpath dbus-glib-devel desktop-file-utils | 14 | BuildRequires: meson ibus-devel chrpath dbus-glib-devel desktop-file-utils |
| 13 | BuildRequires: evolution-data-server-devel gcr-devel gjs-devel glib2-devel | 15 | BuildRequires: evolution-data-server-devel gcr-devel gjs-devel glib2-devel |
| @@ -136,6 +138,12 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null | |||
| 136 | %{_mandir}/man1/gnome-extensions.1.gz | 138 | %{_mandir}/man1/gnome-extensions.1.gz |
| 137 | 139 | ||
| 138 | %changelog | 140 | %changelog |
| 141 | +* Mon Apr 29 2024 chenchen <niutao2@huawei.com> - 3.38.4-6 | ||
| 142 | +- change default favorite app | ||
| 143 | + | ||
| 144 | +* Mon Apr 29 2024 chenchen <niutao2@huawei.com> - 3.38.4-5 | ||
| 145 | +- fix wifi dialog can not close | ||
| 146 | + | ||
| 139 | * Tue Sep 07 2021 chenchen <chen_aka_jan@163.com> - 3.38.4-4 | 147 | * Tue Sep 07 2021 chenchen <chen_aka_jan@163.com> - 3.38.4-4 |
| 140 | - del rpath from some binaries and bin | 148 | - del rpath from some binaries and bin |
| 141 | 149 | ||