rpms/imsettings/devel imsettings-fix-segfault-on-dbus.patch, NONE, 1.1 imsettings-fix-segv-on-xfce-helper.patch, NONE, 1.1 imsettings-none.conf-gtk-xim-default.patch, NONE, 1.1 imsettings.spec, 1.44, 1.45

Akira TAGOH tagoh at fedoraproject.org
Mon Jan 4 07:49:55 UTC 2010


Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv362

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-fix-segfault-on-dbus.patch 
	imsettings-fix-segv-on-xfce-helper.patch 
	imsettings-none.conf-gtk-xim-default.patch 
Log Message:
* Mon Jan  4 2010 Akira TAGOH <tagoh at redhat.com> - 0.107.4-5
- Fix an abort issue. (#530357)

imsettings-fix-segfault-on-dbus.patch:
 factory.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE imsettings-fix-segfault-on-dbus.patch ---
 2010-01-04  Akira TAGOH  <tagoh at redhat.com>
 
	* src/factory.c (imsettings_manager_real_finalize): avoid a segfault
	in libnotify when the dbus session is being closed. (rhbz#530357)

Index: src/factory.c
===================================================================
--- src/factory.c	(リビジョン 368)
+++ src/factory.c	(作業コピー)
@@ -871,6 +871,11 @@
 		g_object_unref(priv->xim_req);
 	if (priv->qt_req)
 		g_object_unref(priv->qt_req);
+	if (priv->notify) {
+		/* XXX: workaround to avoid aborting on dbus. */
+		if (dbus_connection_get_is_connected(priv->req_conn))
+			g_object_unref(priv->notify);
+	}
 	dbus_connection_unref(priv->req_conn);
 	if (priv->monitor)
 		g_object_unref(priv->monitor);
@@ -882,8 +889,6 @@
 		g_hash_table_destroy(priv->aux2info);
 	if (priv->body2info)
 		g_hash_table_destroy(priv->body2info);
-	if (priv->notify)
-		g_object_unref(priv->notify);
 
 	if (G_OBJECT_CLASS (imsettings_manager_parent_class)->finalize)
 		G_OBJECT_CLASS (imsettings_manager_parent_class)->finalize(object);

imsettings-fix-segv-on-xfce-helper.patch:
 main.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE imsettings-fix-segv-on-xfce-helper.patch ---
Index: backends/xfce_xfconf/main.c
===================================================================
--- backends/xfce_xfconf/main.c	(リビジョン 363)
+++ backends/xfce_xfconf/main.c	(作業コピー)
@@ -57,7 +57,7 @@
 main(int argc, char **argv)
 {
 	GError *error = NULL;
-	GConfClient *client = gconf_client_get_default();
+	GConfClient *client = NULL;
 	GMainLoop *loop;
 	GConfEntry *entry;
 	guint ctxt_id;
@@ -68,6 +68,11 @@
 		return 1;
 	}
 
+	client = gconf_client_get_default();
+	if (client == NULL) {
+		g_printerr("Failed to obtain the default GConfClient instance.\n");
+		goto end;
+	}
 	gconf_client_add_dir(client, "/desktop/gnome/interface",
 			     GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
 	if (error) {
@@ -93,7 +98,8 @@
 	loop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(loop);
   end:
-	g_object_unref(client);
+	if (client)
+		g_object_unref(client);
 	xfconf_shutdown();
 
 	return 0;

imsettings-none.conf-gtk-xim-default.patch:
 none.in.in |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE imsettings-none.conf-gtk-xim-default.patch ---
diff -u imsettings-0.107.4/data/none.in.in\~ imsettings-0.107.4/data/none.in.in
--- imsettings-0.107.4/data/none.in.in~	2008-11-05 21:26:53.000000000 +1000
+++ imsettings-0.107.4/data/none.in.in	2009-11-02 11:44:08.000000000 +1000
@@ -1,6 +1,12 @@
 XIM=none
 XIM_PROGRAM=
 XIM_ARGS=
-GTK_IM_MODULE=gtk-im-context-simple
+if [ -f /usr/lib/gtk-2.0/*/immodules/im-xim.so -o \
+     -f /usr/lib64/gtk-2.0/*/immodules/im-xim.so ];
+then
+  GTK_IM_MODULE=xim
+else
+  GTK_IM_MODULE=gtk-im-context-simple
+fi
 QT_IM_MODULE=xim
 IMSETTINGS_IGNORE_ME=yes


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- imsettings.spec	16 Oct 2009 10:22:58 -0000	1.44
+++ imsettings.spec	4 Jan 2010 07:49:53 -0000	1.45
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.4
-Release:	2%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,6 +18,9 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
+Patch2:		imsettings-none.conf-gtk-xim-default.patch
+Patch3:		imsettings-fix-segv-on-xfce-helper.patch
+Patch4:		imsettings-fix-segfault-on-dbus.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -86,6 +89,9 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
+%patch2 -p1 -b .2-xim
+%patch3 -p0 -b .3-xfce
+%patch4 -p0 -b .4-dbus
 
 %build
 %configure	\
@@ -211,8 +217,18 @@ fi
 
 
 %changelog
+* Mon Jan  4 2010 Akira TAGOH <tagoh at redhat.com> - 0.107.4-5
+- Fix an abort issue. (#530357)
+
+* Tue Nov 24 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-4
+- Fix a segfault issue on XFCE desktop. (#540062)
+
+* Mon Nov  2 2009 Jens Petersen <petersen at redhat.com> - 0.107.4-3
+- none.conf: default GTK to xim if available like qt does to fix
+  current missing X locale compose for gtk and X (#505100)
+
 * Fri Oct 16 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-2
-- Run IM for Mailthili by default. (#529144)
+- Run IM for Maithili by default. (#529144)
 
 * Mon Sep 28 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-1
 - New upstream release.




More information about the fedora-extras-commits mailing list