winex11: Drop the x11drv_ime_update_association user callback.

dlls/winex11.drv/dllmain.c

@@ -30,7 +30,6 @@ static const callback_func callback_funcs[] =
 {
     x11drv_dnd_drop_event,
     x11drv_dnd_leave_event,
-    x11drv_ime_update_association,
 };
 
 C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count );

dlls/winex11.drv/ime.c

@@ -146,16 +146,3 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
 
     return TRUE;
 }
-
-/* Interfaces to XIM and other parts of winex11drv */
-
-NTSTATUS x11drv_ime_update_association( UINT arg )
-{
-    HWND focus = UlongToHandle( arg );
-
-    ImmGetContext(focus);
-
-    if (focus && hSelectedFrom)
-        ImmAssociateContext(focus,RealIMC(FROM_X11));
-    return 0;
-}

dlls/winex11.drv/unixlib.h

@@ -92,7 +92,6 @@ enum client_callback
 {
     client_dnd_drop_event,
     client_dnd_leave_event,
-    client_ime_update_association,
     client_funcs_count
 };
 

dlls/winex11.drv/x11drv_dll.h

@@ -34,7 +34,6 @@ extern NTSTATUS WINAPI x11drv_systray_change_owner( void *params, ULONG size ) D
 
 extern NTSTATUS x11drv_dnd_drop_event( UINT arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS x11drv_dnd_leave_event( UINT arg ) DECLSPEC_HIDDEN;
-extern NTSTATUS x11drv_ime_update_association( UINT arg ) DECLSPEC_HIDDEN;
 
 extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam,
                                            LPARAM lparam ) DECLSPEC_HIDDEN;

dlls/winex11.drv/xim.c

@@ -410,8 +410,6 @@ static void xim_open( Display *display, XPointer user, XPointer arg )
     TRACE( "display %p, data %p, arg %p\n", display, user, arg );
     if (!(data->xim = xim_create( data ))) return;
     XUnregisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, user );
-
-    x11drv_client_call( client_ime_update_association, 0 );
 }
 
 static void xim_destroy( XIM xim, XPointer user, XPointer arg )
@@ -434,8 +432,8 @@ void xim_thread_attach( struct x11drv_thread_data *data )
     for (i = 0; list && i < count; ++i) TRACE( "  %d: %s\n", i, list[i] );
     if (list) XFreeStringList( list );
 
-    if ((data->xim = xim_create( data ))) x11drv_client_call( client_ime_update_association, 0 );
-    else XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data );
+    if ((data->xim = xim_create( data ))) return;
+    XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data );
 }
 
 static BOOL xic_destroy( XIC xic, XPointer user, XPointer arg )