rpms/qt/devel fix-im-crash-on-exit.diff, 1.1, 1.2 fix-key-release-event-with-imm.diff, 1.1, 1.2 qt.spec, 1.101, 1.102

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17441

Modified Files:
	fix-im-crash-on-exit.diff fix-key-release-event-with-imm.diff 
	qt.spec 
Log Message:
cleanup patches


fix-im-crash-on-exit.diff:
 qwidget_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: fix-im-crash-on-exit.diff
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/fix-im-crash-on-exit.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix-im-crash-on-exit.diff	27 Feb 2006 18:14:33 -0000	1.1
+++ fix-im-crash-on-exit.diff	27 Feb 2006 18:52:21 -0000	1.2
@@ -1,11 +1,11 @@
---- src/kernel/qwidget_x11.cpp
-+++ src/kernel/qwidget_x11.cpp
-@@ -2751,7 +2751,7 @@
+--- src/kernel/qwidget_x11.cpp.im-crash-on-exit	2006-02-27 19:48:48.000000000 +0100
++++ src/kernel/qwidget_x11.cpp	2006-02-27 19:49:20.000000000 +0100
+@@ -2752,7 +2752,7 @@
  */
  void QWidget::createInputContext()
  {
 -    if( !isInputMethodEnabled() )
 +    if( !isInputMethodEnabled() || QApplication::closingDown() )
-       return;
+ 	return;
  
      QWidget *icWidget = icHolderWidget();

fix-key-release-event-with-imm.diff:
 qapplication_x11.cpp |    9 +++------
 qwidget_x11.cpp      |    5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

Index: fix-key-release-event-with-imm.diff
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/fix-key-release-event-with-imm.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix-key-release-event-with-imm.diff	27 Feb 2006 18:14:33 -0000	1.1
+++ fix-key-release-event-with-imm.diff	27 Feb 2006 18:52:21 -0000	1.2
@@ -1,46 +1,44 @@
---- src/kernel/qapplication_x11.cpp
-+++ src/kernel/qapplication_x11.cpp	2005/01/27 09:41:16
-@@ -3289,11 +3289,7 @@
-     // filtering opportunity first to ensure all input methods work
-     // properly regardless of application design.
- 
--#ifndef QT_NO_IM_EXTENSIONS
-     if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
--#else
--    if( keywidget && keywidget->isEnabled() ) {
--#endif
- 	if( ( event->type==XKeyPress || event->type==XKeyRelease ) &&
- 	    sm_blockUserInput ) // block user interaction during session management
- 	    return TRUE;
---- src/kernel/qwidget_x11.cpp
-+++ src/kernel/qwidget_x11.cpp	2005/01/27 09:43:28
-@@ -2692,11 +2692,10 @@
+--- src/kernel/qwidget_x11.cpp.key-release-event	2006-02-27 19:46:07.000000000 +0100
++++ src/kernel/qwidget_x11.cpp	2006-02-27 19:46:07.000000000 +0100
+@@ -2698,11 +2698,10 @@
  {
      QInputContext *qic = 0;
  
 -#if !defined(QT_NO_IM_EXTENSIONS)
      if ( isInputMethodEnabled() ) {
 +#if !defined(QT_NO_IM_EXTENSIONS)
-       qic = icHolderWidget()->ic;
+ 	qic = icHolderWidget()->ic;
  #else
 -    {
-       // icHolderWidget is always topLevelWidget
-       QTLWExtra *topdata = icHolderWidget()->topData();
-       qic = (QInputContext *)topdata->xic;
-@@ -2747,10 +2746,8 @@
+ 	// icHolderWidget is always topLevelWidget
+ 	QTLWExtra *topdata = icHolderWidget()->topData();
+ 	qic = (QInputContext *)topdata->xic;
+@@ -2753,10 +2752,8 @@
  */
  void QWidget::createInputContext()
  {
 -#if !defined(QT_NO_IM_EXTENSIONS)
      if( !isInputMethodEnabled() )
-       return;
+ 	return;
 -#endif
  
      QWidget *icWidget = icHolderWidget();
  #ifndef QT_NO_IM
---- src/kernel/qapplication_x11.cpp.sav	2005-06-15 15:43:02.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp	2005-06-15 16:26:36.000000000 +0200
-@@ -5209,11 +5209,12 @@ bool QETWidget::translateKeyEventInterna
+--- src/kernel/qapplication_x11.cpp.key-release-event	2006-02-27 19:46:07.000000000 +0100
++++ src/kernel/qapplication_x11.cpp	2006-02-27 19:47:13.000000000 +0100
+@@ -3294,11 +3294,7 @@
+     // filtering opportunity first to ensure all input methods work
+     // properly regardless of application design.
+ 
+-#ifndef QT_NO_IM_EXTENSIONS
+     if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
+-#else
+-    if( keywidget && keywidget->isEnabled() ) {
+-#endif
+ 	if( ( event->type==XKeyPress || event->type==XKeyRelease ) &&
+ 	    sm_blockUserInput ) // block user interaction during session management
+ 	    return TRUE;
+@@ -5220,11 +5216,12 @@
      } else {
  	key = (int)(long)keyDict->find( keycode );
  	if ( key )


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- qt.spec	27 Feb 2006 18:14:34 -0000	1.101
+++ qt.spec	27 Feb 2006 18:52:21 -0000	1.102
@@ -111,8 +111,8 @@
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
-Patch51: fix-im-crash-on-exit.diff
-Patch52: fix-key-release-event-with-imm.diff
+Patch51: fix-key-release-event-with-imm.diff
+Patch52: fix-im-crash-on-exit.diff
 Patch53: qt-x11-immodule-fix-inputcontext-crash.diff
 Patch54: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
 
@@ -352,8 +352,8 @@
 
 %if %{immodule}
 %patch50 -p1
-%patch51 -p0 -b .im-crash-on-exit
-%patch52 -p0 -b .key-release-event
+%patch51 -p0 -b .key-release-event
+%patch52 -p0 -b .im-crash-on-exit
 %patch53 -p0 -b .inputcontext-crash
 %patch54 -p1 -b .quiet
 %endif