[imsettings/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Akira TAGOH]

commit d813eec42b3c4121e2ebd9e779ab917528b3646b
Merge: 6099284 530ed9f
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Oct 18 19:47:17 2012 +0900

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	imsettings.spec

 imsettings-cleanup.patch                 |   32 +++
 imsettings-fix-glib-error.patch          |   11 +
 imsettings-lxde-disable-fallbackim.patch |   20 --
 imsettings-mate.patch                    |  342 ++++++++++++++++++++++++++++++
 imsettings-xfce-disable-fallbackim.patch |   20 --
 imsettings.spec                          |   45 ++++-
 6 files changed, 424 insertions(+), 46 deletions(-)
---
diff --cc imsettings.spec
index ea477d5,ef8ad45..8252e71
--- a/imsettings.spec
+++ b/imsettings.spec
@@@ -6,8 -6,8 +6,8 @@@ URL:		http://code.google.com/p/imsettin
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildRequires:	desktop-file-utils
  BuildRequires:	intltool gettext
- BuildRequires:	libtool automake autoconf
+ BuildRequires:	libtool automake autoconf gtk-doc
 -BuildRequires:	glib2 >= 2.26.0, gobject-introspection-devel, gtk3-devel >= 3.3.3
 +BuildRequires:	glib2 >= 2.26.0, gobject-introspection-devel
  BuildRequires:	libnotify-devel
  BuildRequires:	libX11-devel, libgxim-devel >= 0.3.1
  %if !0%{?rhel}
@@@ -158,6 -181,6 +181,7 @@@ autoconf -
  %configure	\
  	--with-xinputsh=50-xinput.sh \
  	--disable-static \
++	--disable-fallback-im \
  	--disable-schemas-install
  
  make %{?_smp_mflags}
@@@ -263,6 -291,11 +292,10 @@@ f
  
  
  %changelog
+ * Wed Oct 17 2012 Akira TAGOH <tagoh at redhat.com> - 1.2.9-2
+ - Add MATE Desktop support. (#866328)
 -- Drop imsettings-*-disable-fallbackim.patch. no need to stop
 -  fallback anymore.
++- Disable fallback immodule feature entirely.
+ 
  * 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