[im-chooser/f17] Fix a crash issue. (#859624)

Akira TAGOH tagoh at fedoraproject.org
Tue May 28 10:53:36 UTC 2013


commit f02df5d07e0f70abe9f628abaabf2fb14f9c4cc7
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue May 28 19:53:33 2013 +0900

    Fix a crash issue. (#859624)

 im-chooser-fix-segv.patch |   19 +++++++++++++++++++
 im-chooser.spec           |    7 ++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/im-chooser-fix-segv.patch b/im-chooser-fix-segv.patch
new file mode 100644
index 0000000..bd50eb3
--- /dev/null
+++ b/im-chooser-fix-segv.patch
@@ -0,0 +1,19 @@
+diff -pruN im-chooser-1.5.2.2.orig/libimchooseui/imchooseuicellrendererlabel.c im-chooser-1.5.2.2/libimchooseui/imchooseuicellrendererlabel.c
+--- im-chooser-1.5.2.2.orig/libimchooseui/imchooseuicellrendererlabel.c	2011-08-01 18:59:12.000000000 +0900
++++ im-chooser-1.5.2.2/libimchooseui/imchooseuicellrendererlabel.c	2013-05-28 19:51:45.000000000 +0900
+@@ -205,6 +205,7 @@ _imchoose_ui_cell_renderer_label_activat
+ 
+ 	gtk_cell_renderer_get_preferred_width(cell, widget, NULL, &width);
+ 	gtk_cell_renderer_get_preferred_height(cell, widget, NULL, &height);
++	if (event) {
+ 	event->button.x -= (cell_area->x + priv->spacing);
+ 	event->button.y -= cell_area->y;
+ 	width -= priv->spacing;
+@@ -214,6 +215,7 @@ _imchoose_ui_cell_renderer_label_activat
+ 		event->button.y = 0;
+ 		g_signal_emit(cell, signals[SIG_CLICKED], 0, event, path);
+ 	}
++	}
+ 
+ 	return TRUE;
+ }
diff --git a/im-chooser.spec b/im-chooser.spec
index c908218..b84b37a 100644
--- a/im-chooser.spec
+++ b/im-chooser.spec
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	1.5.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 URL:		http://fedorahosted.org/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -11,6 +11,7 @@ BuildRequires:	libxfce4util-devel
 BuildRequires:	desktop-file-utils intltool gettext
 
 Source0:	http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-fix-segv.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -64,6 +65,7 @@ This package contains the XFCE settings panel for im-chooser.
 
 %prep
 %setup -q
+%patch0 -p1 -b .0-segv
 
 %build
 %configure
@@ -135,6 +137,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/xfce4-im-chooser.desktop
 
 %changelog
+* Tue May 28 2013 Akira TAGOH <tagoh at redhat.com> - 1.5.2.2-2
+- Fix a crash issue. (#859624)
+
 * Wed Apr 18 2012 Akira TAGOH <tagoh at redhat.com> - 1.5.2.2-1
 - New upstream release.
   - Update translations (#801232)


More information about the scm-commits mailing list