[uim-commit] r258 - trunk/xim

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-11 11:11:55 -0800 (Tue, 11 Jan 2005)
New Revision: 258

Modified:
   trunk/xim/compose.cpp
   trunk/xim/ximserver.cpp
Log:
* xim/ximserver.cpp (InputContext::focusIn) : Same change as r256
  for uim-xim.
* xim/compose.cpp (XimIM::ParseComposeStringFile) : Cosmetic change.


Modified: trunk/xim/compose.cpp
===================================================================
--- trunk/xim/compose.cpp	2005-01-11 18:38:57 UTC (rev 257)
+++ trunk/xim/compose.cpp	2005-01-11 19:11:55 UTC (rev 258)
@@ -663,7 +663,7 @@
 	mTreeTop->ks = NoSymbol;
     }
 
-    if (fstat(fileno (fp), &st) != -1) {
+    if (fstat(fileno(fp), &st) != -1) {
 	unsigned long size = (unsigned long)st.st_size;
 	if (size <= sizeof tb)
 	    tbp = tb;

Modified: trunk/xim/ximserver.cpp
===================================================================
--- trunk/xim/ximserver.cpp	2005-01-11 18:38:57 UTC (rev 257)
+++ trunk/xim/ximserver.cpp	2005-01-11 19:11:55 UTC (rev 258)
@@ -455,9 +455,9 @@
     setlocale(LC_CTYPE, mLocaleName);
 
     check_helper_connection();
+    uim_helper_client_focus_in(mUc);
     uim_prop_list_update(mUc);	
     uim_prop_label_update(mUc);	
-    uim_helper_client_focus_in(mUc);
     mFocusedContext = this;
 }