aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-07-31 23:07:13 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-07-31 23:08:51 -0400
commit3a656ea836f87f30f1b34852cb4efc911363d2b4 (patch)
tree16a1d0f57a0229712e72af87a95c42e2b6da5519 /gnu/packages
parentccf6401d050ab90afba35d6491692338d84c9f4d (diff)
downloadguix-3a656ea836f87f30f1b34852cb4efc911363d2b4.tar
guix-3a656ea836f87f30f1b34852cb4efc911363d2b4.tar.gz
gnu: jami: Apply upstream patch that fixes a usability issue.
* gnu/packages/patches/jami-fix-esc-bug.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/jami.scm (%jami-sources): Apply it.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/jami.scm3
-rw-r--r--gnu/packages/patches/jami-fix-esc-bug.patch24
2 files changed, 26 insertions, 1 deletions
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 26afed0cc5..95c0052841 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -90,7 +90,8 @@
"plugins"))))
(sha256
(base32
- "1zx0i9aw8jsba3bjc5r4pkkybm8c0lyz420ciq89vsswd48gfdhg"))))
+ "1zx0i9aw8jsba3bjc5r4pkkybm8c0lyz420ciq89vsswd48gfdhg"))
+ (patches (search-patches "jami-fix-esc-bug.patch"))))
;; Jami maintains a set of patches for some key dependencies (currently
;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream.
diff --git a/gnu/packages/patches/jami-fix-esc-bug.patch b/gnu/packages/patches/jami-fix-esc-bug.patch
new file mode 100644
index 0000000000..6d78542f1e
--- /dev/null
+++ b/gnu/packages/patches/jami-fix-esc-bug.patch
@@ -0,0 +1,24 @@
+This fixes the issue where pressing the ESC key would hide the Jami
+GUI on systems lacking a notification tray.
+
+From 47fd4c38ddd8bd350319ce9bb750ca496826e655 Mon Sep 17 00:00:00 2001
+From: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
+Date: Fri, 29 Jul 2022 21:24:01 -0400
+Subject: [PATCH] layoutmanager: fix popFullScreenItem
+
+Change-Id: I79780d4ad570846e6f3c52734dd627bcd0e11327
+---
+
+diff --git a/src/app/LayoutManager.qml b/src/app/LayoutManager.qml
+index 98516ce..87f13ac 100644
+--- a/client-qt/src/app/LayoutManager.qml
++++ b/client-qt/src/app/LayoutManager.qml
+@@ -176,7 +176,7 @@
+
+ // Only leave fullscreen mode if our window isn't in fullscreen
+ // mode already.
+- if (priv.fullScreenItems.length === 0) {
++ if (priv.fullScreenItems.length === 0 && priv.windowedVisibility !== Window.Hidden) {
+ // Simply recall the last visibility state.
+ visibility = priv.windowedVisibility
+ }