rpms/scim-bridge/devel scim-bridge-0.4.15-bz461373.patch, NONE, 1.1 scim-bridge.spec, 1.64, 1.65

[Huang Peng]

Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30771

Modified Files:
	scim-bridge.spec 
Added Files:
	scim-bridge-0.4.15-bz461373.patch 
Log Message:
Resolve bug 461373

scim-bridge-0.4.15-bz461373.patch:

--- NEW FILE scim-bridge-0.4.15-bz461373.patch ---
diff -up scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.bz461373 scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
--- scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.bz461373	2008-09-16 09:54:29.000000000 +0800
+++ scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp	2008-09-16 09:58:47.000000000 +0800
@@ -220,7 +220,12 @@ void ScimBridgeClientIMContextImpl::setF
 {
     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
     QInputContext::setFocusWidget (widget);
-    focus_in ();
+	if (widget == NULL) {
+    	focus_out ();
+	}
+	else {
+    	focus_in ();
+	}
     update ();
 }
 
@@ -442,8 +447,10 @@ void ScimBridgeClientIMContextImpl::focu
         }
     }
 
-    set_preedit_shown (false);
-    update_preedit ();
+	if (preedit_shown) {
+    	set_preedit_shown (false);
+    	update_preedit ();
+	}
 
     focused_imcontext = NULL;
 }


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- scim-bridge.spec	24 Jun 2008 00:53:27 -0000	1.64
+++ scim-bridge.spec	16 Sep 2008 02:04:01 -0000	1.65
@@ -6,7 +6,7 @@
 Name:           scim-bridge
 
 Version:        0.4.15
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -25,6 +25,7 @@
 Requires:       scim >= 1.4.6
 Patch0:         scim-bridge-0.4.15-fix-gdm.patch
 Patch1:         scim-bridge-0.4.15-hotkey-help.patch
+Patch2:			scim-bridge-0.4.15-bz461373.patch
 
 
 %description
@@ -77,6 +78,7 @@
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
 %patch0 -p1 -b .0-fix-gdm
 %patch1 -p1 -b .1-hotkey-help
+%patch2 -p1 -b .2-bz461373
 
 %if %{snapshot}
 mkdir m4
@@ -147,7 +149,10 @@
 
 
 %changelog
-* Mon Apr 21 2008 Caius Chance <cchance at redhat.com> - 0.4.15-6.fc10
+* Tue Sep 16 2008 Huang Peng <phuang at redhat.com> - 0.4.15-7
+- Resolves: bug 461373 (Focus switch causes selected text to be deleted)
+
+* Mon Apr 21 2008 Caius Chance <cchance at redhat.com> - 0.4.15-6
 - Resolves: rhbz#199389 (Add global hotkey list in help window.)
 
 * Thu Apr 03 2008 Huang Peng <phuang at redhat.com> -0.4.15-5