update to 8.5.7

This commit is contained in:
Nikola Pajkovsky 2009-07-22 15:22:44 +00:00
parent fa244a0475
commit 18b44456af
2 changed files with 8 additions and 17 deletions

View File

@ -1,6 +1,6 @@
diff -up tk8.5.6/generic/tkEvent.c.old tk8.5.6/generic/tkEvent.c
--- tk8.5.6/generic/tkEvent.c.old 2008-08-05 22:31:53.000000000 +0200
+++ tk8.5.6/generic/tkEvent.c 2009-02-23 12:37:23.000000000 +0100
diff -up tk8.5.7/generic/tkEvent.c.old tk8.5.7/generic/tkEvent.c
--- tk8.5.7/generic/tkEvent.c.old 2008-08-05 22:31:53.000000000 +0200
+++ tk8.5.7/generic/tkEvent.c 2009-02-23 12:37:23.000000000 +0100
@@ -247,16 +247,10 @@ InvokeFocusHandlers(
}
@ -20,18 +20,6 @@ diff -up tk8.5.6/generic/tkEvent.c.old tk8.5.6/generic/tkEvent.c
(*winPtrPtr)->dispPtr->lastEventTime = eventPtr->xkey.time;
*winPtrPtr = TkFocusKeyEvent(*winPtrPtr, eventPtr);
if (*winPtrPtr == NULL) {
@@ -359,6 +353,11 @@ CreateXIC(
XFree(preedit_attlist);
}
+ if (winPtr->inputContext == NULL) {
+ /* XCreateIC failed. */
+ return;
+ }
+
/*
* Adjust the window's event mask if the IM requires it.
*/
@@ -790,7 +789,7 @@ InvokeGenericHandlers(
int done;

View File

@ -1,10 +1,10 @@
%define majorver 8.5
%define vers %{majorver}.6
%define vers %{majorver}.7
Summary: The graphical toolkit for the Tcl scripting language
Name: tk
Version: %{vers}
Release: 4%{?dist}
Release: 1%{?dist}
Epoch: 1
License: TCL
Group: Development/Languages
@ -116,6 +116,9 @@ rm -rf %{buildroot}
%{_mandir}/man3/*
%changelog
* Wed Jul 22 2009 Nikola Pajkovsky <npajkovs@redhat.com> - 1:8.5.7-1
- update to 8.5.7
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:8.5.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild