Skip to content
Commits on Source (39)
44.0
====
* Bump version
Translators:
Piotr Drąg [pl], Martin [sl], Fran Dieguez [gl], Chao-Hsiung Liao [zh_TW],
Vasil Pupkin [be], Alexandre Franke [fr], Kukuh Syafaat [id],
Fabio Tomat [fur], Sabri Ünal [tr], Anders Jonsson [sv], Boyuan Yang [zh_CN],
Marek Černocký [cs], Alan Mortensen [da], Asier Sarasua Garmendia [eu],
Daniel [es], Aleksandr Melman [ru], MohammadSaleh Kamyab [fa]
44.rc
=====
* Unmute to default volume when slider was at 0 [Florian; !2644]
......
gnome-shell (44.0-2ubuntu1) lunar; urgency=medium
* Merge with debian, containing a new upstream release
* debian/patches: Reload shell theme on color scheme changes
* debian/patches: Do not crash on st settings updates (LP: #2012021)
* debian/patches: Refresh
* Remaining changes with debian:
- Add some Recommends:
+ ubuntu-session (| gnome-session) to have the ubuntu session available
+ ubuntu-wallpapers
+ xserver-xorg-legacy
+ yaru-theme-gnome-shell for the default ubuntu theming
- Move some Recommends to Suggests:
+ chrome-gnome-shell
+ gnome-backgrounds
- Update debian/gbp.conf with Ubuntu settings
- debian/ubuntu-session-mods/ubuntu.json: Use Yaru's gnome-shell icons
- debian/patches: Do not hang & crash if fingerprint service fails to start
(LP: #1962566)
- ubuntu/desktop_detect.patch:
+ add caching for desktop detection to avoid querying the current
desktop env variable as iterate through the list each time. For the
time of the Shell process, we can expect this env variable to stay
stable.
- ubuntu/lightdm-user-switching.patch:
+ Allow user switching when using LightDM.
- ubuntu/lock_on_suspend.patch
+ Respect Ubuntu's lock-on-suspend setting.
- ubuntu/background_login.patch
+ Change default background color as we modified the default GDM color
for our ubuntu session.
- ubuntu/gdm_alternatives.patch
+ Add support for GDM3 theme alternatives
- main-show-an-error-message-on-gnome-shell-crash.patch,
global-make-possible-to-set-debug-flags-dynamically.patch,
main-increase-the-granularity-of-backtraces-in-SHELL_DEBU.patch,
main-add-backtrace-crashes-all-and-backtrace-all.patch,
sessionMode-add-support-for-debugFlags-parameter.patch:
+ Improve debug JS tracing for crash reports
- ubuntu/smarter_alt_tab.patch:
+ quick alt-tab (without showing up the switcher) switch only between
the last window of the last 2 applications to be focused instead of
raising all windows of those apps.
- magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch:
+ Show monitor scaled cursor when magnifier is enabled
- ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch:
+ stop searches when requested from UI
- magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
- u/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
- ubuntu/resolve_alternate_theme_path.patch
- ubuntu/secure_mode_extension.patch
- ubuntu/keep-ubuntu-logo-bright-lp1867133-v1.patch
- ubuntu/configure_login_screen.patch
- ubuntu/layout-Make-starting-in-the-overview-optional.patch:
+ Makes dock replace overview easier
- ubuntu/layout-Try-to-allocate-before-getting-size-of-tracke.patch:
+ Ensure windows don't get maximized under the panels / dock
- debian/patches: Compute system background color from theme (LP: #1965727)
- ubuntu/configure-login-screen.patch: Use bg color for initial system bg
(LP: #1965727)
- debian/patches: Ensure St.Entry's `selected-color` CSS property is
honored (LP: #1878998)
- ubuntu/support-loading-Yaru-variants: Handle dark/light variants better
- d/p/use-favorites-strings: Only apply this to ubuntu session
- debian/patches: Support configuring icons resource to use for mode
- Revert-st-Apply-css-foreground-color-to-text-as-a-PangoAt.patch:
+ Ensure selected-text foreground color is preserved
- ubuntu/sessionMode-Add-support-for-configuring-an-icons-resource.patch:
+ Support loading iconsResourceName from session file
- ubuntu/main-Support-loading-multiple-Yaru-theme-variants.patch,
- ubuntu/darkMode-Add-support-to-Yaru-theme-color-variants.patch:
+ Support loading Yaru theme variants (for accent color)
- ubuntu/Revert-dash-Use-pin-instead-of-favorites
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 21 Mar 2023 05:41:22 +0100
gnome-shell (44.0-2) experimental; urgency=medium
* debian/control: Bump dependency on mutter 44
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 21 Mar 2023 05:37:22 +0100
gnome-shell (44.0-1) experimental; urgency=medium
* New upstream release
* debian/patches: Refresh
* debian/patches: Cherry-pick upstream fixes
* debian/rules: Create a cache home folder for dconf
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 21 Mar 2023 05:20:26 +0100
gnome-shell (44~rc-1ubuntu2) lunar; urgency=medium
* d/ubuntu-session-mods/ubuntu: Add Tiling Assistant as built-in extension
......
......@@ -51,8 +51,8 @@ Build-Depends: appstream,
libgtk-4-dev,
libibus-1.0-dev (>= 1.5.22-2ubuntu2~),
libjson-glib-dev,
libmutter-12-dev (>= 44~rc),
mutter-12-tests (>= 44~rc) <!nocheck>,
libmutter-12-dev (>= 44.0),
mutter-12-tests (>= 44.0) <!nocheck>,
libnm-dev [linux-any],
libpipewire-0.3-dev (>= 0.3.10) [linux-any],
libpolkit-agent-1-dev,
......@@ -65,7 +65,7 @@ Build-Depends: appstream,
libxml2-dev,
mesa-common-dev,
meson (>= 0.58.0),
mutter (>= 44~rc) <!nocheck>,
mutter (>= 44.0) <!nocheck>,
pkg-config,
sassc,
systemd [linux-any],
......@@ -101,7 +101,7 @@ Depends: gir1.2-accountsservice-1.0,
gir1.2-gweather-4.0 (>= 4.1),
gir1.2-freedesktop,
gir1.2-ibus-1.0 (>= 1.5.22-2ubuntu2~),
gir1.2-mutter-12 (>= 44~rc),
gir1.2-mutter-12 (>= 44.0),
gir1.2-nm-1.0 [linux-any],
gir1.2-nma4-1.0 [linux-any],
gir1.2-pango-1.0,
......
......@@ -47,8 +47,8 @@ Build-Depends: appstream,
libgtk-4-dev,
libibus-1.0-dev (>= 1.5.22-2ubuntu2~),
libjson-glib-dev,
libmutter-12-dev (>= 44~rc),
mutter-12-tests (>= 44~rc) <!nocheck>,
libmutter-12-dev (>= 44.0),
mutter-12-tests (>= 44.0) <!nocheck>,
libnm-dev [linux-any],
libpipewire-0.3-dev (>= 0.3.10) [linux-any],
libpolkit-agent-1-dev,
......@@ -61,7 +61,7 @@ Build-Depends: appstream,
libxml2-dev,
mesa-common-dev,
meson (>= 0.58.0),
mutter (>= 44~rc) <!nocheck>,
mutter (>= 44.0) <!nocheck>,
pkg-config,
sassc,
systemd [linux-any],
......@@ -97,7 +97,7 @@ Depends: gir1.2-accountsservice-1.0,
gir1.2-gweather-4.0 (>= 4.1),
gir1.2-freedesktop,
gir1.2-ibus-1.0 (>= 1.5.22-2ubuntu2~),
gir1.2-mutter-12 (>= 44~rc),
gir1.2-mutter-12 (>= 44.0),
gir1.2-nm-1.0 [linux-any],
gir1.2-nma4-1.0 [linux-any],
gir1.2-pango-1.0,
......
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Tue, 14 Mar 2023 17:35:34 +0800
Subject: appDisplay: Avoid using an undefined _swipeTracker
It might have been deleted already during shutdown by `_onDestroy()`.
Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6512
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2693>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/b801370
---
js/ui/appDisplay.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 17afb89..75a458f 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1237,7 +1237,8 @@ var BaseAppView = GObject.registerClass({
}
vfunc_unmap() {
- this._swipeTracker.enabled = false;
+ if (this._swipeTracker)
+ this._swipeTracker.enabled = false;
this._disconnectDnD();
super.vfunc_unmap();
}
......@@ -27,7 +27,7 @@ index 224456d..d4292ca 100644
imports.gi.versions.Gdm = '1.0';
imports.gi.versions.Geoclue = '2.0';
diff --git a/meson.build b/meson.build
index 2c2c585..5b66e06 100644
index 56a6b5a..f43e78f 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@ libmutter_test_pc = 'libmutter-test-' + mutter_api_version
......
......@@ -8,13 +8,13 @@ This reverts commit 207b9bb3c0a582b830218fd1b6e8760684adbc48.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/meson.build b/tests/meson.build
index 2f96a73..8d06645 100644
index 088a0ce..c1279fb 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -55,7 +55,7 @@ libgvc_path = fs.parent(libgvc.get_variable('libgvc').full_path())
@@ -51,7 +51,7 @@ libgvc_path = fs.parent(libgvc.get_variable('libgvc').full_path())
background_file = files(join_paths('data', 'background.png'))
perf_testenv = testenv
perf_testenv = environment()
-perf_testenv.set('G_DEBUG', 'fatal-warnings')
+perf_testenv.set('G_DEBUG', 'fatal-criticals')
perf_testenv.set('G_MESSAGES_DEBUG', 'GNOME Shell')
......
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 15 Mar 2023 20:11:39 +0100
Subject: endSessionDialog: Catch async errors
Otherwise the actual error is masked by an "unhandled promise
rejection" error, making it harder to track down the underlying
cause.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6506
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2696>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/3471244
---
js/ui/endSessionDialog.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 66fc2e6..3de1085 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -235,7 +235,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._loginManager = LoginManager.getLoginManager();
this._canRebootToBootLoaderMenu = false;
- this._getCanRebootToBootLoaderMenu();
+ this._getCanRebootToBootLoaderMenu().catch(logError);
this._userManager = AccountsService.UserManager.get_default();
this._user = this._userManager.get_user(GLib.get_user_name());
@@ -449,7 +449,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
action: () => {
let signalId = this.connect('closed', () => {
this.disconnect(signalId);
- this._confirm(signal);
+ this._confirm(signal).catch(logError);
});
this.close(true);
},
@@ -501,7 +501,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
_confirmRebootToBootLoaderMenu() {
this._loginManager.setRebootToBootLoaderMenu();
- this._confirm('ConfirmedReboot');
+ this._confirm('ConfirmedReboot').catch(logError);
}
async _confirm(signal) {
@@ -589,7 +589,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
let dialogContent = DialogContent[this._type];
let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
- this._confirm(button.signal);
+ this._confirm(button.signal).catch(logError);
this._timerId = 0;
return GLib.SOURCE_REMOVE;
@@ -759,7 +759,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
}
if (dialogContent.showOtherSessions)
- this._loadSessions();
+ this._loadSessions().catch(logError);
let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 13 Feb 2023 00:26:29 +0100
Subject: extension-tool: Set reminder for removing old compat code
GSettings schemas are now compiled at install time, so it is no
longer necessary to include the compiled schema in the archive.
However the `gnome-extensions pack` command hasn't been adjusted,
so that it can still be used to produce valid archives for all
supported versions.
To not let that code linger forever, error out when building
a version where GNOME 44 is the oldest supported release.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2639>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/43401b9
---
subprojects/extensions-tool/src/command-pack.c | 4 ++++
subprojects/extensions-tool/src/meson.build | 1 +
2 files changed, 5 insertions(+)
diff --git a/subprojects/extensions-tool/src/command-pack.c b/subprojects/extensions-tool/src/command-pack.c
index c8d9950..f2cfcd5 100644
--- a/subprojects/extensions-tool/src/command-pack.c
+++ b/subprojects/extensions-tool/src/command-pack.c
@@ -163,12 +163,16 @@ extension_pack_add_schemas (ExtensionPack *pack,
return FALSE;
}
+#if MAJOR_VERSION >= 46
+#error "Outdated compatibility code, please remove"
+#else
dstpath = g_file_get_path (dstdir);
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error,
"glib-compile-schemas", "--strict", dstpath, NULL);
if (!g_subprocess_wait_check (proc, NULL, error))
return FALSE;
+#endif
g_hash_table_insert (pack->files,
g_strdup ("schemas"), g_steal_pointer (&dstdir));
diff --git a/subprojects/extensions-tool/src/meson.build b/subprojects/extensions-tool/src/meson.build
index a855fef..f7bda8a 100644
--- a/subprojects/extensions-tool/src/meson.build
+++ b/subprojects/extensions-tool/src/meson.build
@@ -1,6 +1,7 @@
config_h = configuration_data()
config_h.set_quoted('GETTEXT_PACKAGE', package_name)
config_h.set_quoted('VERSION', meson.project_version())
+config_h.set('MAJOR_VERSION', meson.project_version().split('.')[0])
config_h.set_quoted('LOCALEDIR', localedir)
config_h.set('HAVE_BIND_TEXTDOMAIN_CODESET', cc.has_function('bind_textdomain_codeset'))
configure_file(
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 14 Mar 2023 12:57:43 +0100
Subject: extensionSystem: Fix extension reloading
Unloading an extension has become an async operation, but we aren't
awaiting the result. That means that we recreate the extension
object *before* we remove the "old" extension object from the map,
with the effect that the reloaded extension is removed completely.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6507
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2694>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/0b8114b
---
js/ui/extensionSystem.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 4cdaa3d..d9cdf77 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -432,7 +432,7 @@ var ExtensionManager = class extends Signals.EventEmitter {
let { uuid, dir, type } = oldExtension;
// Then unload the old extension.
- this.unloadExtension(oldExtension);
+ await this.unloadExtension(oldExtension);
// Now, recreate the extension and load it.
let newExtension;
......@@ -21,7 +21,7 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/6
3 files changed, 100 insertions(+), 12 deletions(-)
diff --git a/src/main.c b/src/main.c
index 6b4a100..0e9ff42 100644
index d4988e9..a9ea4e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -353,14 +353,14 @@ shell_a11y_init (void)
......
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 20 Mar 2023 19:18:29 +0100
Subject: main: Add missing newlines
Unlike the various log macros, g_printerr() does not append '\n'
by itself.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2709>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/7250d9d
---
src/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main.c b/src/main.c
index 8cccc0a..e81f92c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,7 +90,7 @@ shell_dbus_init (gboolean replace)
session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
if (error) {
- g_printerr ("Failed to connect to session bus: %s", error->message);
+ g_printerr ("Failed to connect to session bus: %s\n", error->message);
exit (1);
}
@@ -105,7 +105,7 @@ shell_dbus_init (gboolean replace)
if (!bus)
{
- g_printerr ("Failed to get a session bus proxy: %s", error->message);
+ g_printerr ("Failed to get a session bus proxy: %s\n", error->message);
exit (1);
}
@@ -598,7 +598,7 @@ main (int argc, char **argv)
if (!meta_context_configure (context, &argc, &argv, &error))
{
- g_printerr ("Failed to configure: %s", error->message);
+ g_printerr ("Failed to configure: %s\n", error->message);
return EXIT_FAILURE;
}
@@ -610,7 +610,7 @@ main (int argc, char **argv)
if (!meta_context_setup (context, &error))
{
- g_printerr ("Failed to setup: %s", error->message);
+ g_printerr ("Failed to setup: %s\n", error->message);
return EXIT_FAILURE;
}
@@ -656,13 +656,13 @@ main (int argc, char **argv)
if (!meta_context_start (context, &error))
{
- g_printerr ("GNOME Shell failed to start: %s", error->message);
+ g_printerr ("GNOME Shell failed to start: %s\n", error->message);
return EXIT_FAILURE;
}
if (!meta_context_run_main_loop (context, &error))
{
- g_printerr ("GNOME Shell terminated with an error: %s", error->message);
+ g_printerr ("GNOME Shell terminated with an error: %s\n", error->message);
ecode = EXIT_FAILURE;
}
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 17 Mar 2023 01:05:48 +0100
Subject: main: Fix syncing animations-enabled
Whether or not animations should be enabled depends on various
factors, some of which may change at runtime. We therefore
track changes, and sync the setting by calling inhibit/uninhibit
as necessary.
Except that we never actually record the new state, so when animations
are disabled, we end up inhibiting them every time
the setting is synced, whoops.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2698>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/2f196f4
---
js/ui/main.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/js/ui/main.js b/js/ui/main.js
index 16c1eef..cf9357f 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -963,6 +963,7 @@ var AnimationsSettings = class {
const shouldEnableAnimations = this._shouldEnableAnimations();
if (this._animationsEnabled === shouldEnableAnimations)
return;
+ this._animationsEnabled = shouldEnableAnimations;
const settings = St.Settings.get();
if (shouldEnableAnimations)
......@@ -15,7 +15,7 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/6
2 files changed, 9 insertions(+)
diff --git a/src/main.c b/src/main.c
index be674cb..895a9e6 100644
index 0d56b23..88d0513 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,6 +55,13 @@ static const GDebugKey SHELL_DEBUG_KEYS[] = {
......
......@@ -15,7 +15,7 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/6
2 files changed, 65 insertions(+), 21 deletions(-)
diff --git a/src/main.c b/src/main.c
index 0e9ff42..be674cb 100644
index a9ea4e9..0d56b23 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,16 +39,26 @@ static gboolean is_gdm_mode = FALSE;
......
......@@ -16,7 +16,7 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/6
1 file changed, 2 insertions(+)
diff --git a/src/main.c b/src/main.c
index 8cccc0a..6b4a100 100644
index e81f92c..d4988e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -423,6 +423,8 @@ dump_gjs_stack_on_signal_handler (int signo)
......
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 15 Mar 2023 20:41:48 +0100
Subject: modalDialog: Fix fading out dialog
The dialog's state property has been read-only since
commit 2f6323afc, but the callback at the end of the
fade transition still tries to set the value directly.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6506
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2696>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/5766d41
---
js/ui/modalDialog.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 64800a3..0561b8b 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -282,7 +282,7 @@ var ModalDialog = GObject.registerClass({
opacity: 0,
duration: FADE_OUT_DIALOG_TIME,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
- onComplete: () => (this.state = State.FADED_OUT),
+ onComplete: () => this._setState(State.FADED_OUT),
});
}
});
......@@ -11,13 +11,17 @@ This caused these windows to be never tracked by mutter and then we
never received a "::window-created" signal that should lead a ShellTrayIcon
to associate itself as the clone of the created MetaWindow.
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2684
So, still keep it offscreen, but at different location.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2684>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/20a81d7
---
src/tray/na-xembed.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tray/na-xembed.c b/src/tray/na-xembed.c
index 5dbb372..7b6f0b7 100644
index 5dbb372..2183c9f 100644
--- a/src/tray/na-xembed.c
+++ b/src/tray/na-xembed.c
@@ -393,7 +393,7 @@ na_xembed_add_window (NaXembed *xembed,
......@@ -25,7 +29,7 @@ index 5dbb372..7b6f0b7 100644
XCreateWindow (xdisplay,
meta_x11_display_get_xroot (priv->x11_display),
- -100, -100, 1, 1, 0,
+ -101, -101, 1, 1, 0,
+ -1, -1, 1, 1, 0,
priv->xvisual_info->depth,
InputOutput,
plug_attrs.visual,
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 13 Mar 2023 10:54:33 +0100
Subject: 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>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/58af42c
---
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 48ca1ae..fd84a74 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) {
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Mon, 20 Mar 2023 11:49:24 -0700
Subject: screenshot: Use meta_window_has_pointer () for pointer check
https://gitlab.gnome.org/GNOME/mutter/-/commit/909616b20876478bc56932cd18c8e85e982645f6 seems to have wrapped window actors in a container, so the actor.has_pointer check started failing. Instead, switch to meta_window_has_pointer () which doesn't rely on window actor implementation details.
We check for existence of has_pointer first just in case someone attempts to run gnome-shell 44.1 with mutter 44.0 which does not have the function exported publicly yet.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2710>
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/4daea0c
---
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 fd84a74..59c63c7 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -787,7 +787,7 @@ class UIWindowSelectorWindow extends St.Button {
this._cursor = null;
this._cursorPoint = { x: 0, y: 0 };
- this._shouldShowCursor = actor.get_children().some(c => c.has_pointer);
+ this._shouldShowCursor = window.has_pointer && window.has_pointer();
this.connect('destroy', this._onDestroy.bind(this));
}