rpms/qt3/devel qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 qt3.spec, 1.7, 1.8 sources, 1.2, 1.3 qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff, 1.1, NONE qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch, 1.1, NONE qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3938

Modified Files:
	.cvsignore qt3.spec sources 
Added Files:
	qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff 
Removed Files:
	qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff 
	qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch 
	qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch 
Log Message:
* update qt-x11-immodule-unified-qt3 patch


qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff:

--- NEW FILE qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff ---
diff -up qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp.fix-key-release-event-with-imm qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp
--- qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp.fix-key-release-event-with-imm	2008-10-08 14:50:10.000000000 +0200
+++ qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp	2008-10-08 14:50:10.000000000 +0200
@@ -3297,11 +3297,7 @@ int QApplication::x11ProcessEvent( XEven
     // 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;
@@ -5223,11 +5219,12 @@ bool QETWidget::translateKeyEventInterna
     } else {
 	key = (int)(long)keyDict->find( keycode );
 	if ( key )
-	    if( !willRepeat ) // Take out key of dictionary only if this call.
+	    if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
 		keyDict->take( keycode );
 	long s = (long)textDict->find( keycode );
 	if ( s ) {
-	    textDict->take( keycode );
+	    if( statefulTranslation )
+	        textDict->take( keycode );
 	    ascii = (char)(s-256);
 	}
     }
diff -up qt-x11-free-3.3.8b/src/kernel/qwidget_x11.cpp.fix-key-release-event-with-imm qt-x11-free-3.3.8b/src/kernel/qwidget_x11.cpp
--- qt-x11-free-3.3.8b/src/kernel/qwidget_x11.cpp.fix-key-release-event-with-imm	2008-10-08 14:50:10.000000000 +0200
+++ qt-x11-free-3.3.8b/src/kernel/qwidget_x11.cpp	2008-10-08 14:59:03.000000000 +0200
@@ -2700,11 +2700,10 @@ QInputContext *QWidget::getInputContext(
 {
     QInputContext *qic = 0;
 
-#if !defined(QT_NO_IM_EXTENSIONS)
     if ( isInputMethodEnabled() ) {
+#if !defined(QT_NO_IM_EXTENSIONS)
       qic = icHolderWidget()->ic;
 #else
-    {
       // icHolderWidget is always topLevelWidget
       QTLWExtra *topdata = icHolderWidget()->topData();
       qic = (QInputContext *)topdata->xic;
@@ -2755,10 +2754,8 @@ void QWidget::changeInputContext( const 
 */
 void QWidget::createInputContext()
 {
-#if !defined(QT_NO_IM_EXTENSIONS)
     if( !isInputMethodEnabled() || QApplication::closingDown() )
       return;
-#endif
 
     QWidget *icWidget = icHolderWidget();
 #ifndef QT_NO_IM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Mar 2008 18:50:07 -0000	1.2
+++ .cvsignore	8 Oct 2008 13:06:14 -0000	1.3
@@ -1,2 +1,3 @@
 qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2
 qt-x11-free-3.3.8b.tar.gz
+qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2


Index: qt3.spec
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt3.spec	30 Sep 2008 10:16:52 -0000	1.7
+++ qt3.spec	8 Oct 2008 13:06:14 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 16%{?dist}
+Release: 17%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -49,12 +49,10 @@
 Patch37: qt-3.3.6-fontrendering-gu-228452.patch
 
 # immodule patches
-Patch50: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch
-Patch51: qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2
-Patch52: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch
-Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
-Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff
-Patch55: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
+Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
+Patch51: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
+Patch52: qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff
+Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
 
 # qt-copy patches
 Patch100: 0038-dragobject-dont-prefer-unknown.patch
@@ -350,12 +348,10 @@
 
 # immodule patches
 %if %{immodule}
-%patch50 -p1 -b .pre
-%patch51 -p1
-%patch52 -p1 -b .post
-%patch53 -p1 -b .quiet
-%patch54 -p1 -b .fix-key-release-event-with-imm
-%patch55 -p1 -b .resetinputcontext
+%patch50 -p1
+%patch51 -p1 -b .quiet
+%patch52 -p1 -b .fix-key-release-event-with-imm
+%patch53 -p1 -b .resetinputcontext
 %endif
 
 # qt-copy patches
@@ -645,6 +641,9 @@
 
 
 %changelog
+* Wed Oct 08 2008 Than Ngo <than at redhat.com> 3.3.8b-17
+- update qt-x11-immodule-unified-qt3 patch
+
 * Tue Sep 30 2008 Than Ngo <than at redhat.com> 3.3.8b-16
 - mv translations in main package (bz#448761)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Mar 2008 18:50:07 -0000	1.2
+++ sources	8 Oct 2008 13:06:14 -0000	1.3
@@ -1,2 +1,2 @@
-91adfea39f17a64b86497bce32782cf3  qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2
 9f05b4125cfe477cc52c9742c3c09009  qt-x11-free-3.3.8b.tar.gz
+aab0717be8ffc3beeb3791c0c42a5c24  qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2


--- qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff DELETED ---


--- qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch DELETED ---


--- qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch DELETED ---