From 04df932f46cb6020e15eda0c1ddff5378f4efe5a Mon Sep 17 00:00:00 2001 From: NiuTao Date: Mon, 29 Apr 2024 10:16:17 +0800 Subject: [PATCH 1/2] fix wifi dialog can not close --- ...-shell-fix-wifi-dialog-can-not-close.patch | 49 +++++++++++++++++++ gnome-shell.spec | 6 ++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gnome-shell-fix-wifi-dialog-can-not-close.patch diff --git a/gnome-shell-fix-wifi-dialog-can-not-close.patch b/gnome-shell-fix-wifi-dialog-can-not-close.patch new file mode 100644 index 0000000..2bc00ab --- /dev/null +++ b/gnome-shell-fix-wifi-dialog-can-not-close.patch @@ -0,0 +1,49 @@ +commit 0890a7405c6e579d6b81520d00b899fda6fe9009 +Author: NiuTao +Date: Mon Apr 29 10:12:36 2024 +0800 + + fix wifi dialog can not close + +diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js +index caa8744..23bcd27 100644 +--- a/js/ui/modalDialog.js ++++ b/js/ui/modalDialog.js +@@ -202,7 +202,7 @@ var ModalDialog = GObject.registerClass({ + this._savedKeyFocus = focus; + else + this._savedKeyFocus = null; +- Main.popModal(this, timestamp); ++ Main.popModal(this); + this._hasModal = false; + + if (!this._shellReactive) +@@ -214,8 +214,6 @@ var ModalDialog = GObject.registerClass({ + return true; + + let params = { actionMode: this._actionMode }; +- if (timestamp) +- params['timestamp'] = timestamp; + if (!Main.pushModal(this, params)) + return false; + +diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js +index 4f461f3..b686b9e 100644 +--- a/js/ui/unlockDialog.js ++++ b/js/ui/unlockDialog.js +@@ -877,7 +877,6 @@ var UnlockDialog = GObject.registerClass({ + return true; + + let modalParams = { +- timestamp, + actionMode: Shell.ActionMode.UNLOCK_SCREEN, + }; + if (!Main.pushModal(this, modalParams)) +@@ -894,7 +893,7 @@ var UnlockDialog = GObject.registerClass({ + + popModal(timestamp) { + if (this._isModal) { +- Main.popModal(this, timestamp); ++ Main.popModal(this); + this._isModal = false; + } + } diff --git a/gnome-shell.spec b/gnome-shell.spec index 3d01793..c20a866 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 3.38.4 -Release: 4 +Release: 5 Summary: Core user interface functions for the GNOME 3 desktop Group: User Interface/Desktops License: GPLv2+ @@ -8,6 +8,7 @@ URL: https://wiki.gnome.org/Projects/GnomeShell Source0: http://download.gnome.org/sources/gnome-shell/3.38/%{name}-%{version}.tar.xz Patch1: gnome-shell-favourite-apps-firefox.patch +Patch2: gnome-shell-fix-wifi-dialog-can-not-close.patch BuildRequires: meson ibus-devel chrpath dbus-glib-devel desktop-file-utils BuildRequires: evolution-data-server-devel gcr-devel gjs-devel glib2-devel @@ -136,6 +137,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %{_mandir}/man1/gnome-extensions.1.gz %changelog +* Mon Apr 29 2024 chenchen - 3.38.4-5 +- fix wifi dialog can not close + * Tue Sep 07 2021 chenchen - 3.38.4-4 - del rpath from some binaries and bin -- Gitee From 9e4a63544c1f99148087b30c1076ee43264ac1dd Mon Sep 17 00:00:00 2001 From: NiuTao Date: Mon, 29 Apr 2024 11:25:43 +0800 Subject: [PATCH 2/2] change default favorite app --- gnome-shell-change-default-favorite-app.patch | 31 +++++++++++++++++++ gnome-shell.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnome-shell-change-default-favorite-app.patch diff --git a/gnome-shell-change-default-favorite-app.patch b/gnome-shell-change-default-favorite-app.patch new file mode 100644 index 0000000..4ee2c06 --- /dev/null +++ b/gnome-shell-change-default-favorite-app.patch @@ -0,0 +1,31 @@ +commit e08a3eec1d99cdc5b37b2f0ef54e22729bb25f7a +Author: NiuTao +Date: Mon Apr 29 11:23:39 2024 +0800 + + change default favorite app + +diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in +index c2f008f..495dd7f 100644 +--- a/data/org.gnome.shell.gschema.xml.in ++++ b/data/org.gnome.shell.gschema.xml.in +@@ -50,7 +50,7 @@ + + + +- [ 'firefox.desktop', 'org.gnome.Calendar.desktop', 'rhythmbox.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ] ++ [ 'code.desktop', 'org.gnome.Terminal.desktop', 'firefox.desktop' ] + List of desktop file IDs for favorite applications + + The applications corresponding to these identifiers +diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js +index 24ce16f..04c015c 100644 +--- a/js/ui/appFavorites.js ++++ b/js/ui/appFavorites.js +@@ -11,6 +11,7 @@ const Main = imports.ui.main; + const RENAMED_DESKTOP_IDS = { + 'baobab.desktop': 'org.gnome.baobab.desktop', + 'cheese.desktop': 'org.gnome.Cheese.desktop', ++ 'code.desktop': 'code.desktop', + 'dconf-editor.desktop': 'ca.desrt.dconf-editor.desktop', + 'empathy.desktop': 'org.gnome.Empathy.desktop', + 'eog.desktop': 'org.gnome.eog.desktop', diff --git a/gnome-shell.spec b/gnome-shell.spec index c20a866..71a506b 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 3.38.4 -Release: 5 +Release: 6 Summary: Core user interface functions for the GNOME 3 desktop Group: User Interface/Desktops License: GPLv2+ @@ -9,6 +9,7 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.38/%{name}-%{ver Patch1: gnome-shell-favourite-apps-firefox.patch Patch2: gnome-shell-fix-wifi-dialog-can-not-close.patch +Patch3: gnome-shell-change-default-favorite-app.patch BuildRequires: meson ibus-devel chrpath dbus-glib-devel desktop-file-utils BuildRequires: evolution-data-server-devel gcr-devel gjs-devel glib2-devel @@ -137,6 +138,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %{_mandir}/man1/gnome-extensions.1.gz %changelog +* Mon Apr 29 2024 chenchen - 3.38.4-6 +- change default favorite app + * Mon Apr 29 2024 chenchen - 3.38.4-5 - fix wifi dialog can not close -- Gitee