Backport a fix for screenshot notifications

This commit is contained in:
Adam Williamson 2023-03-24 09:42:06 -07:00
parent 7829f908cf
commit f75a6a62e7
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From 58af42caeaf8ef51f62aa22880c04638f21d5e06 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 13 Mar 2023 10:54:33 +0100
Subject: [PATCH] screenshot: Fix code typo
Even though commit b89d90eb8 talked about the GLib.BookmarkFile
type, this didn't stop the code from sneaking a silly typo and
refer to this GLib.BookmarksFile (i.e. extra 's').
Fix the code to refer to the right type name and constructor.
Fixes: b89d90eb8 ("screenshot: Use GLib.BookmarkFile to save recent screenshots")
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2692>
---
js/ui/screenshot.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index 48ca1ae76..fd84a74f8 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -2076,7 +2076,7 @@ function _storeScreenshot(bytes, pixbuf) {
const recentFile =
GLib.build_filenamev([GLib.get_user_data_dir(), 'recently-used.xbel']);
const uri = screenshotFile.get_uri();
- const bookmarks = new GLib.BookmarksFile();
+ const bookmarks = new GLib.BookmarkFile();
try {
bookmarks.load_from_file(recentFile);
} catch (e) {
--
2.40.0

View File

@ -2,13 +2,18 @@
Name: gnome-shell
Version: 44.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+
URL: https://wiki.gnome.org/Projects/GnomeShell
Source0: https://download.gnome.org/sources/gnome-shell/44/%{name}-%{tarball_version}.tar.xz
# https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/58af42caeaf8ef51f62aa22880c04638f21d5e06
# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6539
# Fix a typo that broke screenshot notifications
Patch0: 0001-screenshot-Fix-code-typo.patch
# Replace Epiphany with Firefox in the default favourite apps list
Patch10001: gnome-shell-favourite-apps-firefox.patch
@ -228,6 +233,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Porta
%{_mandir}/man1/gnome-shell.1*
%changelog
* Fri Mar 24 2023 Adam Williamson <awilliam@redhat.com> - 44.0-3
- Backport a fix for screenshot notifications
* Sun Mar 19 2023 Florian Müllner <fmuellner@redhat.com> - 44.0-2
- Fix timed logout
Resolves: #2177853