diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 10:56:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 10:56:56 +0300 |
| commit | e4b68befa2eb26df7114507f41102a60b5d38fe7 (patch) | |
| tree | 2373ddbd8863d9e1e7e21f3dd64c5d3826d7e986 /intern | |
| parent | 451203c58ddce8dec9ba91dff65a06266e63d4ef (diff) | |
| parent | 697d4b227e71a6e90329e2cb4e83dafcddb4af72 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index e740542961e..11aa2094997 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -598,13 +598,15 @@ GHOST_WindowX11(GHOST_SystemX11 *system, } #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) -static void destroyICCallback(XIC /*xic*/, XPointer ptr, XPointer /*data*/) +static Bool destroyICCallback(XIC /*xic*/, XPointer ptr, XPointer /*data*/) { GHOST_PRINT("XIM input context destroyed\n"); if (ptr) { *(XIC *)ptr = NULL; } + /* Ignored by X11. */ + return True; } bool GHOST_WindowX11::createX11_XIC() |