diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-17 23:28:45 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-23 23:56:15 -0400 |
| commit | 84369105d4fc8c6f9399e6157112259deada30b8 (patch) | |
| tree | dd28744f672ad0f6f5c8fe07b117b95e6c50340b /gnu/packages/patches | |
| parent | 503cfd542124d5e6983c28839953424e44b88244 (diff) | |
gnu: jami: Update to 20220825.0828.c10f01f.
* gnu/packages/jami.scm (jami): Update to 20220825.0828.c10f01f.
(%jami-version): Set to latest release.
(%jami-sources): Remove jami-fix-esc-bug.patch; add
jami-fix-crash-on-block-contact.patch.
* gnu/packages/patches/jami-fix-esc-bug.patch: Delete file.
* gnu/packages/patches/jami-fix-crash-on-block-contact.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/jami-fix-crash-on-block-contact.patch | 32 | ||||
| -rw-r--r-- | gnu/packages/patches/jami-fix-esc-bug.patch | 24 |
2 files changed, 32 insertions, 24 deletions
diff --git a/gnu/packages/patches/jami-fix-crash-on-block-contact.patch b/gnu/packages/patches/jami-fix-crash-on-block-contact.patch new file mode 100644 index 0000000000..60dab79296 --- /dev/null +++ b/gnu/packages/patches/jami-fix-crash-on-block-contact.patch @@ -0,0 +1,32 @@ +From 673dc5f525c9d478fc22f8ea0a50d9849a81f6c8 Mon Sep 17 00:00:00 2001 +From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> +Date: Fri, 2 Sep 2022 13:32:10 -0400 +Subject: [PATCH] conversation: fix crash when block contact + +This patch fixes crash that happened when block contact +for not active account. + +GitLab: #758 +Change-Id: I5347394a67cdffe0d95c9ee03aedf9d2618cec55 +--- + src/jamidht/jamiaccount.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/daemon/src/jamidht/jamiaccount.cpp b/daemon/src/jamidht/jamiaccount.cpp +index fe15eedb2..9d0a5ee68 100644 +--- a/daemon/src/jamidht/jamiaccount.cpp ++++ b/daemon/src/jamidht/jamiaccount.cpp +@@ -1129,7 +1129,9 @@ JamiAccount::loadAccount(const std::string& archive_password, + if (auto convModule = shared->convModule()) + convModule->removeContact(uri, banned); + // Remove current connections with contact +- shared->connectionManager_->closeConnectionsWith(uri); ++ if (shared->connectionManager_) { ++ shared->connectionManager_->closeConnectionsWith(uri); ++ } + // Update client. + emitSignal<DRing::ConfigurationSignal::ContactRemoved>(shared->getAccountID(), + uri, +-- +2.37.3 + diff --git a/gnu/packages/patches/jami-fix-esc-bug.patch b/gnu/packages/patches/jami-fix-esc-bug.patch deleted file mode 100644 index 6d78542f1e..0000000000 --- a/gnu/packages/patches/jami-fix-esc-bug.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - } |