Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gnome-shell for openSUSE:Factory 
checked in at 2021-10-12 21:47:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-shell.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-shell"

Tue Oct 12 21:47:56 2021 rev:208 rq:923680 version:41.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes  2021-09-29 
20:17:53.654833590 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-shell.new.2443/gnome-shell.changes        
2021-10-12 21:48:01.975758306 +0200
@@ -1,0 +2,10 @@
+Wed Oct  6 20:15:02 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add 380d2db1d9047ecffcef7d78f00184963b403efc.patch: inputMethod:
+  Clear preeditStr before reset. Previously, these were performed
+  in a different order before GNOME 41. During some other changes
+  they were swapped.
+  However, this causes both GTK 3 and GTK 4 applications to scroll
+  to incorrect positions from the preedit change.
+
+-------------------------------------------------------------------

New:
----
  380d2db1d9047ecffcef7d78f00184963b403efc.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-shell.spec ++++++
--- /var/tmp/diff_new_pack.tHVdPg/_old  2021-10-12 21:48:02.627759239 +0200
+++ /var/tmp/diff_new_pack.tHVdPg/_new  2021-10-12 21:48:02.631759245 +0200
@@ -44,6 +44,8 @@
 Patch6:         gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
 # PATCH-FIX-OPENSUSE gnome-shell-executable-path-not-absolute.patch 
bsc#1176051 xw...@suse.com --  Fix ExecStart is not absolute path
 Patch7:         gnome-shell-executable-path-not-absolute.patch
+# PATCH-FIX-UPSTREAM 380d2db1d9047ecffcef7d78f00184963b403efc.patch -- 
inputMethod: Clear preeditStr before reset
+Patch8:         
https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/380d2db1d9047ecffcef7d78f00184963b403efc.patch
 
 ## NOTE: Keep SLE-only patches at bottom (starting on 1000).
 # PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 
dli...@suse.com -- Add an applet on login UI to display suse icon, product 
name, hostname.
@@ -181,6 +183,7 @@
 %patch6 -p1
 %endif
 %patch7 -p1
+%patch8 -p1
 
 %if 0%{?sle_version}
 %patch1001 -p1

++++++ 380d2db1d9047ecffcef7d78f00184963b403efc.patch ++++++
>From 380d2db1d9047ecffcef7d78f00184963b403efc Mon Sep 17 00:00:00 2001
From: Christian Hergert <cherg...@redhat.com>
Date: Wed, 29 Sep 2021 12:46:45 -0700
Subject: [PATCH] inputMethod: Clear preeditStr before reset

Previously, these were performed in a different order before GNOME 41.
During some other changes they were swapped.

However, this causes both GTK 3 and GTK 4 applications to scroll to
incorrect positions from the preedit change.

Fixes #4647
Fixes GNOME/gtk#4289
Fixes GNOME/gnome-builder#1536
Fixes GNOME/gnome-builder#1531

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1993>
---
 js/misc/inputMethod.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
index 25b02e35b8..1f9eaee7a8 100644
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -179,16 +179,16 @@ class InputMethod extends Clutter.InputMethod {
     }
 
     vfunc_reset() {
+        if (this._context) {
+            this._context.reset();
+            this._emitRequestSurrounding();
+        }
+
         if (this._preeditStr !== null) {
             // Unset any preedit text
             this.set_preedit_text(null, 0, Clutter.PreeditResetMode.CLEAR);
             this._preeditStr = null;
         }
-
-        if (this._context) {
-            this._context.reset();
-            this._emitRequestSurrounding();
-        }
     }
 
     vfunc_set_cursor_location(rect) {
-- 
GitLab

Reply via email to