Update to 45.rc
This commit is contained in:
parent
76c8125d05
commit
2aae6b0da1
1
.gitignore
vendored
1
.gitignore
vendored
@ -217,3 +217,4 @@ gnome-shell-2.31.5.tar.bz2
|
|||||||
/gnome-shell-45.alpha.tar.xz
|
/gnome-shell-45.alpha.tar.xz
|
||||||
/gnome-shell-45.beta.tar.xz
|
/gnome-shell-45.beta.tar.xz
|
||||||
/gnome-shell-45.beta.1.tar.xz
|
/gnome-shell-45.beta.1.tar.xz
|
||||||
|
/gnome-shell-45.rc.tar.xz
|
||||||
|
@ -1,88 +0,0 @@
|
|||||||
From e442e9daf632d2ceb276f9e254d5850a33f91667 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ray Strode <rstrode@redhat.com>
|
|
||||||
Date: Wed, 6 Sep 2023 09:23:51 -0400
|
|
||||||
Subject: [PATCH] backgroundApps: Don't crash if app id can't be looked up
|
|
||||||
|
|
||||||
I'm looking at a log file with this trace back:
|
|
||||||
|
|
||||||
JS ERROR: TypeError: a.app is null
|
|
||||||
_sync/<@resource:///org/gnome/shell/ui/status/backgroundApps.js:226:17
|
|
||||||
_sync@resource:///org/gnome/shell/ui/status/backgroundApps.js:225:14
|
|
||||||
_init/</<@resource:///org/gnome/shell/ui/status/backgroundApps.js:170:67
|
|
||||||
@resource:///org/gnome/shell/ui/init.js:21:20
|
|
||||||
|
|
||||||
This commit should avoid the failure by filtering out items where
|
|
||||||
lookup_app fails.
|
|
||||||
---
|
|
||||||
js/ui/status/backgroundApps.js | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/js/ui/status/backgroundApps.js b/js/ui/status/backgroundApps.js
|
|
||||||
index d6f2e495b..5dff0bdff 100644
|
|
||||||
--- a/js/ui/status/backgroundApps.js
|
|
||||||
+++ b/js/ui/status/backgroundApps.js
|
|
||||||
@@ -199,60 +199,61 @@ class BackgroundAppsToggle extends QuickToggle {
|
|
||||||
}
|
|
||||||
|
|
||||||
_syncVisibility() {
|
|
||||||
const {isLocked} = Main.sessionMode;
|
|
||||||
const nBackgroundApps = this._proxy?.BackgroundApps?.length;
|
|
||||||
// We cannot hide the quick toggle while the menu is open, otherwise
|
|
||||||
// the menu position goes bogus. We can't show it in locked sessions
|
|
||||||
// either
|
|
||||||
this.visible = !isLocked && (this.menu.isOpen || nBackgroundApps > 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
_sync() {
|
|
||||||
this._syncVisibility();
|
|
||||||
|
|
||||||
if (!this._proxy)
|
|
||||||
return;
|
|
||||||
|
|
||||||
const {BackgroundApps: backgroundApps} = this._proxy;
|
|
||||||
|
|
||||||
this._appsSection.removeAll();
|
|
||||||
|
|
||||||
const items = new Map();
|
|
||||||
(backgroundApps ?? [])
|
|
||||||
.map(backgroundApp => {
|
|
||||||
const appId = backgroundApp.app_id.deepUnpack();
|
|
||||||
const app = this._appSystem.lookup_app(`${appId}.desktop`);
|
|
||||||
const message = backgroundApp.message?.deepUnpack();
|
|
||||||
|
|
||||||
return {app, message};
|
|
||||||
})
|
|
||||||
+ .filter(backgroundApp => backgroundApp.app)
|
|
||||||
.sort((a, b) => {
|
|
||||||
return a.app.get_name().localeCompare(b.app.get_name());
|
|
||||||
})
|
|
||||||
.forEach(backgroundApp => {
|
|
||||||
const {app, message} = backgroundApp;
|
|
||||||
|
|
||||||
let item = items.get(app);
|
|
||||||
if (!item) {
|
|
||||||
item = new BackgroundAppMenuItem(app);
|
|
||||||
items.set(app, item);
|
|
||||||
this._appsSection.addMenuItem(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (message)
|
|
||||||
item.set({message});
|
|
||||||
});
|
|
||||||
|
|
||||||
const nBackgroundApps = items.size;
|
|
||||||
this.title = nBackgroundApps === 0
|
|
||||||
? _('No Background Apps')
|
|
||||||
: ngettext(
|
|
||||||
'%d Background App',
|
|
||||||
'%d Background Apps',
|
|
||||||
nBackgroundApps).format(nBackgroundApps);
|
|
||||||
this._listTitle.visible = nBackgroundApps > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
vfunc_clicked() {
|
|
||||||
this.menu.open();
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
|||||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||||
|
|
||||||
Name: gnome-shell
|
Name: gnome-shell
|
||||||
Version: 45~beta.1
|
Version: 45~rc
|
||||||
Release: %autorelease -b 4
|
Release: %autorelease
|
||||||
Summary: Window management and application launching for GNOME
|
Summary: Window management and application launching for GNOME
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -20,8 +20,6 @@ Patch: 0001-status-keyboard-Add-a-catch-around-reload-call.patch
|
|||||||
Patch: 0002-status-keyboard-Load-keyboard-from-system-settings-i.patch
|
Patch: 0002-status-keyboard-Load-keyboard-from-system-settings-i.patch
|
||||||
Patch: 0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch
|
Patch: 0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch
|
||||||
|
|
||||||
Patch: 0001-backgroundApps-Don-t-crash-if-app-id-can-t-be-looked.patch
|
|
||||||
|
|
||||||
%define eds_version 3.45.1
|
%define eds_version 3.45.1
|
||||||
%define gnome_desktop_version 44.0-7
|
%define gnome_desktop_version 44.0-7
|
||||||
%define glib2_version 2.56.0
|
%define glib2_version 2.56.0
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (gnome-shell-45.beta.1.tar.xz) = 3430e36d46294f5d2d3fd839ebdd505f029f13efbf80fcb4934ec3cf8fd8489dee00c01d7596821f59826c0857e8afffac7832dab7b9843493694dbdadc858e6
|
SHA512 (gnome-shell-45.rc.tar.xz) = fb8d58311fe1a1248d1d931005f308d09e6b0d5a76ed77cc8ba89cafe64901ad34123eb2edb05057ef1b2b5db0c8a5095d28bca3e6f2396e120fc5d24417ef8a
|
||||||
|
Loading…
Reference in New Issue
Block a user