[imsettings] New upstream release.

[Akira TAGOH]

commit 4f4ca85713973184845a72d9da244b702e52b99d
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Apr 23 17:53:36 2012 +0900

    New upstream release.
    
      - fallback to lookup the default configuration on XDG dirs
    - Disable fallback immodule feature for XFCE and LXDE so far.

 imsettings-lxde-disable-fallbackim.patch |   20 ++++++++++++++++++++
 imsettings-xfce-disable-fallbackim.patch |   20 ++++++++++++++++++++
 imsettings.spec                          |   11 ++++++++++-
 sources                                  |    2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/imsettings-lxde-disable-fallbackim.patch b/imsettings-lxde-disable-fallbackim.patch
new file mode 100644
index 0000000..ccd7d7c
--- /dev/null
+++ b/imsettings-lxde-disable-fallbackim.patch
@@ -0,0 +1,20 @@
+diff -pruN imsettings-1.2.9.orig/backends/lxde/lxde-module.c imsettings-1.2.9/backends/lxde/lxde-module.c
+--- imsettings-1.2.9.orig/backends/lxde/lxde-module.c	2012-04-23 17:28:00.000000000 +0900
++++ imsettings-1.2.9/backends/lxde/lxde-module.c	2012-04-23 17:50:52.000000000 +0900
+@@ -69,11 +69,12 @@ _update_config(const gchar *configdir,
+ 		}
+ 	}
+ 
+-#ifdef ENABLE_FALLBACK_IM
+-	val = g_strdup_printf("%s:xim", module);
+-#else
++// gtk+ >= 3.3.3 is required
++//#ifdef ENABLE_FALLBACK_IM
++//	val = g_strdup_printf("%s:xim", module);
++//#else
+ 	val = g_strdup(module);
+-#endif
++//#endif
+ 	g_key_file_set_string(key, "GTK", "sGtk/IMModule",
+ 			      val);
+ 
diff --git a/imsettings-xfce-disable-fallbackim.patch b/imsettings-xfce-disable-fallbackim.patch
new file mode 100644
index 0000000..702ae9d
--- /dev/null
+++ b/imsettings-xfce-disable-fallbackim.patch
@@ -0,0 +1,20 @@
+diff -pruN imsettings-1.2.8.1.orig/backends/xfce/xfce-module.c imsettings-1.2.8.1/backends/xfce/xfce-module.c
+--- imsettings-1.2.8.1.orig/backends/xfce/xfce-module.c	2011-11-17 12:30:27.000000000 +0900
++++ imsettings-1.2.8.1/backends/xfce/xfce-module.c	2012-04-23 14:46:01.000000000 +0900
+@@ -53,11 +53,12 @@ module_switch_im(IMSettingsInfo *info)
+ 		g_error_free(err);
+ 		return;
+ 	}
+-#ifdef ENABLE_FALLBACK_IM
+-	val = g_strdup_printf("%s:xim", gtkimm);
+-#else
++// gtk+ >= 3.3.3 is required
++//#ifdef ENABLE_FALLBACK_IM
++//	val = g_strdup_printf("%s:xim", gtkimm);
++//#else
+ 	val = g_strdup(gtkimm);
+-#endif
++//#endif
+ 	ch = xfconf_channel_new("xsettings");
+ 	if (!xfconf_channel_set_string(ch, "/Gtk/IMModule", val)) {
+ 		g_warning("Unable to set %s to xfconf.", val);
diff --git a/imsettings.spec b/imsettings.spec
index 9ec0421..6502b9a 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,5 +1,5 @@
 Name:		imsettings
-Version:	1.2.8.1
+Version:	1.2.9
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
@@ -17,6 +17,8 @@ Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-xinput-xcompose.patch
+Patch3:		imsettings-xfce-disable-fallbackim.patch
+Patch4:		imsettings-lxde-disable-fallbackim.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -149,6 +151,8 @@ This package contains a module to get this working on LXDE.
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xcompose
+%patch3 -p1 -b .3-xfce-no-fallbackim
+%patch4 -p1 -b .4-lxde-no-fallbackim
 
 %build
 %configure	\
@@ -259,6 +263,11 @@ fi
 
 
 %changelog
+* Mon Apr 23 2012 Akira TAGOH <tagoh at redhat.com> - 1.2.9-1
+- New upstream release.
+  - fallback to lookup the default configuration on XDG dirs
+- Disable fallback immodule feature for XFCE and LXDE so far.
+
 * Mon Mar 19 2012 Akira TAGOH <tagoh at redhat.com> - 1.2.8.1-1
 - New upstream release.
 
diff --git a/sources b/sources
index fb4aa33..5713f4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e32ed5572277ada32b286aecbc24631  imsettings-1.2.8.1.tar.bz2
+3e4b97705bca1fba195e3a0cabd253d5  imsettings-1.2.9.tar.bz2