diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2004-11-02 23:06:25 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2004-11-02 23:06:25 +0000 |
| commit | 4d431bbaae40a5a99988c4d8e7d5d33dc717710f (patch) | |
| tree | 553fa8bdba0c1bc2f8f5c4de2c40c9dd126a6558 /libxklavier/xklavier.c | |
| parent | 2fc330af2405d304aa79457a4e43a1d6e709cd70 (diff) | |
| download | libxklavier-4d431bbaae40a5a99988c4d8e7d5d33dc717710f.tar.gz | |
virtualizing xkb functions into vtable. preparing 1.11
Diffstat (limited to 'libxklavier/xklavier.c')
| -rw-r--r-- | libxklavier/xklavier.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c index 0ce8a53..2c1f7b6 100644 --- a/libxklavier/xklavier.c +++ b/libxklavier/xklavier.c @@ -148,7 +148,6 @@ int XklStopListen( ) int XklInit( Display * a_dpy ) { - int opcode; int scr; char *sdl; int rv; @@ -559,7 +558,7 @@ Bool _XklGetAppState( Window appWin, XklState * state_return ) ( _xklDpy, appWin, _xklAtoms[XKLAVIER_STATE], 0L, XKLAVIER_STATE_PROP_LENGTH, False, XA_INTEGER, &type_ret, &format_ret, &nitems, &rest, - ( unsigned char ** ) &prop ) == Success ) + ( unsigned char ** ) ( void * ) &prop ) == Success ) && ( type_ret == XA_INTEGER ) && ( format_ret == 32 ) ) { grp = prop[0]; @@ -684,11 +683,10 @@ Bool _XklIsTransparentAppWindow( Window appWin ) int format_ret; unsigned long nitems, rest; CARD32 *prop = NULL; - Bool retVal; if( ( XGetWindowProperty ( _xklDpy, appWin, _xklAtoms[XKLAVIER_TRANSPARENT], 0L, 1, False, XA_INTEGER, &type_ret, &format_ret, &nitems, &rest, - ( unsigned char ** ) &prop ) == Success ) + ( unsigned char ** ) ( void * ) &prop ) == Success ) && ( type_ret == XA_INTEGER ) && ( format_ret == 32 ) ) { if( prop != NULL ) |