Backport a couple more fixes, relating to IBus this time

These two fixes together fix setting surrounding text for input
methods, and avoid some log spam when no input method is active.

0001-inputMethod-Add-a-null-check-for-text-in-vfunc_set_s.patch

@@ -0,0 +1,27 @@
+From 0cf2d396b0d584f59402a6a0c42376639bd314ef Mon Sep 17 00:00:00 2001
+From: Andrea Azzarone <andrea.azzarone@canonical.com>
+Date: Mon, 17 Sep 2018 18:00:04 +0200
+Subject: [PATCH] inputMethod: Add a null-check for text in
+ vfunc_set_surrounding.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/579
+---
+ js/misc/inputMethod.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
+index 320a6cc33..ec84f7277 100644
+--- a/js/misc/inputMethod.js
++++ b/js/misc/inputMethod.js
+@@ -176,7 +176,7 @@ var InputMethod = new Lang.Class({
+     },
+ 
+     vfunc_set_surrounding(text, cursor, anchor) {
+-        if (this._context)
++        if (this._context && text)
+             this._context.set_surrounding_text(text, cursor, anchor);
+     },
+ 
+-- 
+2.19.0
+

228.patch

@@ -0,0 +1,34 @@
+From 0c52baebe72a616a211b386c93afd0e67618764d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 11 Sep 2018 15:36:35 +0200
+Subject: [PATCH] inputMethod: Fix setting surrounding text
+
+The underlying ibus method expects an object of type IBusText rather
+than a plain string.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/228
+---
+ js/misc/inputMethod.js | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
+index ec84f7277..7fb78178a 100644
+--- a/js/misc/inputMethod.js
++++ b/js/misc/inputMethod.js
+@@ -176,8 +176,11 @@ var InputMethod = new Lang.Class({
+     },
+ 
+     vfunc_set_surrounding(text, cursor, anchor) {
+-        if (this._context && text)
+-            this._context.set_surrounding_text(text, cursor, anchor);
++        if (!this._context || !text)
++            return;
++
++        let ibusText = IBus.Text.new_from_string(text);
++        this._context.set_surrounding_text(ibusText, cursor, anchor);
+     },
+ 
+     vfunc_update_content_hints(hints) {
+-- 
+2.18.0
+

gnome-shell.spec

@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.30.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -48,6 +48,13 @@ Patch10: 0001-windowMenu-Port-from-Meta.ScreenDirection-to-Meta.Di.patch
 # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/221
 Patch11: 0001-theme-define-proper-hover-and-active-states.patch
 
+# Add a null check and fix an IBus type error that affect input
+# methods (and causes log spam when they're not enabled)
+# https://gitlab.gnome.org/GNOME/gnome-shell/commit/0cf2d396b0d584f59402a6a0c42376639bd314ef
+# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/228
+Patch12: 0001-inputMethod-Add-a-null-check-for-text-in-vfunc_set_s.patch
+Patch13: 228.patch
+
 %define libcroco_version 0.6.8
 %define eds_version 3.17.2
 %define gnome_desktop_version 3.7.90
@@ -243,6 +250,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Sep 22 2018 Adam Williamson <awilliam@redhat.com> - 3.30.0-8
+- Backport fix for IBus type issue (GGO MR #228)
+
 * Wed Sep 19 2018 Adam Williamson <awilliam@redhat.com> - 3.30.0-7
 - Replace dnd fix from -5 with upstream version (GGO MR #209)
 - Fix a window destroy crash which can occur with new gjs (GGO #539)