E SVN: raster trunk/ecore/src/lib/ecore_x/xlib

[Enlightenment S. <no-...@en...>]

Log:
  be mroe explicit on keeping im handle.
  
  
Author:       raster
Date:         2010-06-03 23:36:54 -0700 (Thu, 03 Jun 2010)
New Revision: 49444

Modified:
  trunk/ecore/src/lib/ecore_x/xlib/ecore_x.c 

Modified: trunk/ecore/src/lib/ecore_x/xlib/ecore_x.c
===================================================================
--- trunk/ecore/src/lib/ecore_x/xlib/ecore_x.c	2010-06-04 06:09:15 UTC (rev 49443)
+++ trunk/ecore/src/lib/ecore_x/xlib/ecore_x.c	2010-06-04 06:36:54 UTC (rev 49444)
@@ -63,6 +63,7 @@
 int      _ecore_x_event_last_root_y = 0;
 int      _ecore_x_xcursor = 0;
 XIC      _ecore_x_ic = NULL; /* Input context for composed characters */
+XIM      _ecore_x_im = NULL;
 
 Ecore_X_Window _ecore_x_private_win = 0;
 
@@ -538,8 +539,11 @@
 	if (ret || !supported_styles)
 	  goto _im_create_error;
 	for (i = 0; i < supported_styles->count_styles; i++)
-	  if (supported_styles->supported_styles[i] == (XIMPreeditNothing | XIMStatusNothing))
-	    chosen_style = supported_styles->supported_styles[i];
+          {
+             if (supported_styles->supported_styles[i] == 
+                 (XIMPreeditNothing | XIMStatusNothing))
+               chosen_style = supported_styles->supported_styles[i];
+          }
 	XFree(supported_styles);
 	if (!chosen_style)
 	  goto _im_create_error;
@@ -547,6 +551,7 @@
 	if (ic)
 	  {
 	     _ecore_x_ic = ic;
+             _ecore_x_im = im;
 	     goto _im_create_end;
 	  }
 _im_create_error:
@@ -556,16 +561,15 @@
 #endif
    return _ecore_x_init_count;
 
- free_event_handlers:
+free_event_handlers:
    free(_ecore_x_event_handlers);
    _ecore_x_event_handlers = NULL;
- close_display:
+close_display:
    XCloseDisplay(_ecore_x_disp);
    _ecore_x_fd_handler_handle = NULL;
    _ecore_x_disp = NULL;
- shutdown_ecore_event:
+shutdown_ecore_event:
    ecore_event_shutdown();
-
    return --_ecore_x_init_count;
 }
 
@@ -581,12 +585,14 @@
 #ifdef ENABLE_XIM
    if (_ecore_x_ic)
      {
-	XIM xim;
-	xim = XIMOfIC(_ecore_x_ic);
 	XDestroyIC(_ecore_x_ic);
-	XCloseIM(xim);
 	_ecore_x_ic = NULL;
      }
+   if (_ecore_x_im)
+     {
+	XCloseIM(_ecore_x_im);
+        _ecore_x_im = NULL;
+     }
 #endif
    if (close_display)
       XCloseDisplay(_ecore_x_disp);