From cb03dc643acf08dfbf671b5a6417ccedc2dd024b9656e32a108ef790eaef26b2 Mon Sep 17 00:00:00 2001
From: Fuminobu Takeyama <ftake@geeko.jp>
Date: Thu, 31 Oct 2013 15:36:41 +0000
Subject: [PATCH] Accepting request 205368 from home:tiwai:branches:M17N

- Always-save-the-content-type-cache-for-gnome-shell-p.patch:
  This is an additional fix patch for ibus to avoid the wrong
  IBus.InputPurpose.PASSWORD advertisement, which leads to the
  password text appearance on GNOME3 (bnc#847718)

OBS-URL: https://build.opensuse.org/request/show/205368
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=83
---
 ...content-type-cache-for-gnome-shell-p.patch | 30 +++++++++++++++++++
 ibus.changes                                  |  8 +++++
 ibus.spec                                     |  3 ++
 3 files changed, 41 insertions(+)
 create mode 100644 Always-save-the-content-type-cache-for-gnome-shell-p.patch

diff --git a/Always-save-the-content-type-cache-for-gnome-shell-p.patch b/Always-save-the-content-type-cache-for-gnome-shell-p.patch
new file mode 100644
index 0000000..05c0d22
--- /dev/null
+++ b/Always-save-the-content-type-cache-for-gnome-shell-p.patch
@@ -0,0 +1,30 @@
+From 9596aea2e2df4cd3ac9b795ad9f354723cf83317 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Wed, 2 Oct 2013 10:58:36 +0900
+Subject: [PATCH] Always save the content-type cache for gnome-shell password.
+
+GDBusProxy updates the cache immediatelly with the first call only
+and has to save the next call in the cache by manual.
+
+BUG=RH#1013948
+TEST=password on gnome-shell 3.10.
+
+Review URL: https://codereview.appspot.com/14196043
+---
+ bus/engineproxy.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/bus/engineproxy.c
++++ b/bus/engineproxy.c
+@@ -1159,6 +1159,11 @@ bus_engine_proxy_set_content_type (BusEn
+                            NULL,
+                            NULL,
+                            NULL);
++
++        /* Need to update the cache by manual since there is a timing issue. */
++        g_dbus_proxy_set_cached_property ((GDBusProxy *) engine,
++                                          "ContentType",
++                                          content_type);
+     }
+ 
+     if (cached_content_type != NULL)
diff --git a/ibus.changes b/ibus.changes
index 15eeaeb..a6f9e25 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 31 14:46:37 CET 2013 - tiwai@suse.de
+
+- Always-save-the-content-type-cache-for-gnome-shell-p.patch:
+  This is an additional fix patch for ibus to avoid the wrong
+  IBus.InputPurpose.PASSWORD advertisement, which leads to the
+  password text appearance on GNOME3 (bnc#847718)
+
 -------------------------------------------------------------------
 Thu Oct 17 07:13:31 UTC 2013 - i@marguerite.su
 
diff --git a/ibus.spec b/ibus.spec
index d3018b6..21051bb 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -41,6 +41,8 @@ Patch2:         reload-preload-engines-until-users-customize-the-list.patch
 %endif
 # PATCH-FIX-OPENSUSE reload-preload-engines-until-users-customize-the-list.patch ftake@geeko.jp
 Patch3:         show-input-mode-icon.patch
+# PATCH-FIX-UPSTREAM Always-save-the-content-type-cache-for-gnome-shell-p.patch bnc#847718
+Patch4:         Always-save-the-content-type-cache-for-gnome-shell-p.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /usr/bin/touch
 Provides:       locale(ja;ko;zh)
@@ -188,6 +190,7 @@ rm -f data/dconf/00-upstream-settings
 %endif
 
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -fi