From bcf54f178243c36acd8e05025afae57acfa97f3d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 30 Nov 2018 11:34:27 -0800
Subject: [PATCH] Backport PR #293 to fix 'empty input method indicator' bug

---
 ...on-t-pass-undefined-callback-to-ibus.patch | 33 +++++++++++++++++++
 gnome-shell.spec                              |  9 ++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 0001-ibusManager-Don-t-pass-undefined-callback-to-ibus.patch

diff --git a/0001-ibusManager-Don-t-pass-undefined-callback-to-ibus.patch b/0001-ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
new file mode 100644
index 0000000..2fba78b
--- /dev/null
+++ b/0001-ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
@@ -0,0 +1,33 @@
+From 74bb9e62492bacda372904d30891eb97685e9b0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 15 Nov 2018 18:47:55 +0100
+Subject: [PATCH] ibusManager: Don't pass undefined callback to ibus
+
+Since commit 551e8278416, we don't always pass a callback parameter.
+However passing it on as undefined to ibus doesn't work, as gjs doesn't
+accept that as a valid callback value and throw an error. As a result,
+we can end up with no layout selected in the keyboard menu and an "empty"
+indicator. Fix this by explicitly passing null if no callback has been
+provided.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/293
+---
+ js/misc/ibusManager.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
+index 34f198c35..33ad8777e 100644
+--- a/js/misc/ibusManager.js
++++ b/js/misc/ibusManager.js
+@@ -210,7 +210,7 @@ var IBusManager = new Lang.Class({
+         }
+ 
+         this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
+-                                           null, callback);
++                                           null, callback || null);
+     },
+ 
+     preloadEngines(ids) {
+-- 
+2.19.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 4b7aec5..9ad9486 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.31.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -18,6 +18,10 @@ Patch1: gnome-shell-favourite-apps-firefox.patch
 Patch2: 0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch
 Patch3: 0002-endSessionDialog-Support-rebooting-into-the-bootload.patch
 
+# Fix empty input method indicator
+# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/293
+Patch4: 0001-ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
+
 %define libcroco_version 0.6.8
 %define eds_version 3.17.2
 %define gnome_desktop_version 3.7.90
@@ -214,6 +218,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Fri Nov 30 2018 Adam Williamson <awilliam@redhat.com> - 3.31.2-2
+- Backport PR #293 to fix 'empty input method indicator' bug
+
 * Wed Nov 14 2018 Florian Müllner <fmuellner@redhat.com> - 3.31.2-1
 - Update to 3.31.2