From 56eee8db4e69f0bf80bffc41d4f30918affce239 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Apr 26 2011 07:47:51 +0000
Subject: New upstream release.

Fix an issue keeping alive the defunct process.
Stop a notification when no backend modules available. (#693809)
Better handling of detecting the supported toolkits/desktops.

---

diff --git a/imsettings-disable-xim.patch b/imsettings-disable-xim.patch
index a28ad53..ce1b607 100644
--- a/imsettings-disable-xim.patch
+++ b/imsettings-disable-xim.patch
@@ -1,25 +1,19 @@
-diff -pruN imsettings-0.106.2.orig/data/xinput.sh.in.in imsettings-0.106.2/data/xinput.sh.in.in
---- imsettings-0.106.2.orig/data/xinput.sh.in.in	2009-04-07 16:11:28.000000000 +0900
-+++ imsettings-0.106.2/data/xinput.sh.in.in	2009-04-13 18:32:35.000000000 +0900
-@@ -60,14 +60,15 @@ function setup_qt_immodule() {
+diff -pruN imsettings-1.2.2.orig/data/xinput.sh.in.in imsettings-1.2.2/data/xinput.sh.in.in
+--- imsettings-1.2.2.orig/data/xinput.sh.in.in	2011-04-22 20:35:24.000000000 +0900
++++ imsettings-1.2.2/data/xinput.sh.in.in	2011-04-26 16:41:19.165486325 +0900
+@@ -80,10 +80,11 @@ function is_qt_supported() {
  }
  
- function setup_xim() {
--    if is_imsettings_enabled; then
--	# setup XMODIFIERS
--	XMODIFIERS="@im=imsettings"
--	export XMODIFIERS
--    else
-+# XXX: Disable XIM support so far.
-+#    if is_imsettings_enabled; then
-+#	# setup XMODIFIERS
-+#	XMODIFIERS="@im=imsettings"
-+#	export XMODIFIERS
-+#    else
- 	[ -z "$XMODIFIERS" -a -n "$XIM" ] && XMODIFIERS="@im=$XIM"
- 	[ -n "$XMODIFIERS" ] && export XMODIFIERS
+ function is_xim_supported() {
+-    [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
+-    if check_imsettings_capability xim; then
+-	return 0
 -    fi
++# XXX: Disable XIM support so far
++#    [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
++#    if check_imsettings_capability xim; then
++#	return 0
 +#    fi
- }
  
- function run_imsettings() {
+     return 1
+ }
diff --git a/imsettings.spec b/imsettings.spec
index 098fc2e..0b4e340 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,6 +1,6 @@
 Name:		imsettings
-Version:	1.2.1
-Release:	2%{?dist}
+Version:	1.2.2
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -254,6 +254,12 @@ fi
 
 
 %changelog
+* Tue Apr 26 2011 Akira TAGOH <tagoh@redhat.com> - 1.2.2-1
+- New upstream release.
+  - Fix an issue keeping alive the defunct process.
+  - Stop a notification when no backend modules available. (#693809)
+  - Better handling of detecting the supported toolkits/desktops.
+
 * Thu Apr 21 2011 Christopher Aillon <caillon@redhat.com> - 1.2.1-2
 - Bring in the correct desktop IM module (#693809)
 
diff --git a/sources b/sources
index ea89256..a259369 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d67cf6fff59a10a68d34598a70d27dd  imsettings-1.2.1.tar.bz2
+f8ebc45bbc00f71a392909a6434e878c  imsettings-1.2.2.tar.bz2