From 03d58454a2eaf21d9b7460c3bca8ddc7cf404f53 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Oct 23 2008 13:24:26 +0000
Subject: - New upstream release.

- Fix another freeze issue. (#452849)
- imsettings-r210.patch: removed.

---

diff --git a/.cvsignore b/.cvsignore
index 5a32893..43961c8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ imsettings-0.103.0.tar.bz2
 imsettings-0.104.0.tar.bz2
 imsettings-0.104.1.tar.bz2
 imsettings-0.105.0.tar.bz2
+imsettings-0.105.1.tar.bz2
diff --git a/imsettings-r210.patch b/imsettings-r210.patch
deleted file mode 100644
index 373f742..0000000
--- a/imsettings-r210.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-2008-10-21  Akira TAGOH  <tagoh@redhat.com>
-
-	* src/factory.c (imsettings_manager_real_start_im): allow to start none
-	without any warnings.
-
-Index: src/factory.c
-===================================================================
---- src/factory.c	(revision 209)
-+++ src/factory.c	(working copy)
-@@ -517,19 +517,22 @@
- 		pidfile = NULL;
- 	}
- 
--	xim_prog = imsettings_info_get_xim_program(info);
--	xim_args = imsettings_info_get_xim_args(info);
--	if (xim_prog == NULL) {
--		g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_INVALID_IMM,
--			    _("No XIM server is available in %s"), module);
--		goto end;
-+	/* hack to allow starting none.conf */
-+	if (strcmp(module, "none") != 0) {
-+		xim_prog = imsettings_info_get_xim_program(info);
-+		xim_args = imsettings_info_get_xim_args(info);
-+		if (xim_prog == NULL) {
-+			g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_INVALID_IMM,
-+				    _("No XIM server is available in %s"), module);
-+			goto end;
-+		}
-+		pidfile = _build_pidfilename(xinputfile, priv->display_name, "xim");
-+
-+		/* bring up a XIM server */
-+		if (!_start_process(xim_prog, xim_args, pidfile, lang, error))
-+			goto end;
- 	}
--	pidfile = _build_pidfilename(xinputfile, priv->display_name, "xim");
- 
--	/* bring up a XIM server */
--	if (!_start_process(xim_prog, xim_args, pidfile, lang, error))
--		goto end;
--
- 	/* FIXME: We need to take care of imsettings per X screens?
- 	 */
- 	/* FIXME: have to deal with the errors */
diff --git a/imsettings.spec b/imsettings.spec
index 201f743..719d98c 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,12 +1,12 @@
 Name:		imsettings
-Version:	0.105.0
-Release:	4%{?dist}
+Version:	0.105.1
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	intltool gettext
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
-BuildRequires:	libgxim-devel >= 0.3.0, libnotify-devel
+BuildRequires:	libgxim-devel >= 0.3.1, libnotify-devel
 BuildRequires:	xfce-mcs-manager-devel libxfce4mcs-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	libX11-devel
@@ -14,7 +14,6 @@ Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
 # workaround for KDE, it will be removed when we have a correct fix
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
-Patch1:		imsettings-r210.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -79,7 +78,6 @@ This package contains a plugin to get this working on Xfce.
 %prep
 %setup -q
 %patch0 -p1 -b .0-lang
-%patch1 -p0 -b .1-allow-none-to-start
 
 %build
 %configure	\
@@ -187,6 +185,11 @@ fi
 
 
 %changelog
+* Thu Oct 23 2008 Akira TAGOH <tagoh@redhat.com> - 0.105.1-1
+- New upstream release.
+  - Fix another freeze issue. (#452849)
+- imsettings-r210.patch: removed.
+
 * Tue Oct 21 2008 Akira TAGOH <tagoh@redhat.com> - 0.105.0-4
 - Read %%{_sysconfdir}/X11/xinput.d/none.conf for non-CJKI locales to make
   consistency in the status on im-chooser. so it would /disables/ IM regardless
diff --git a/sources b/sources
index fa8e540..f710f5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b09d459f772dcd81cf94173099bd516f  imsettings-0.105.0.tar.bz2
+f59b921f0fac514275246c673ae97c28  imsettings-0.105.1.tar.bz2