diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2006-02-18 01:19:06 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2006-02-18 01:19:06 +0000 |
| commit | 1b1249064163471c44e6f4079c3147c219d0bc4c (patch) | |
| tree | b64f4ac05d0f83b47658bae8c4ceb3d848e38c23 | |
| parent | c4fa5d6941a85ceb05be6667ca9c32199a6cd240 (diff) | |
| download | libxklavier-1b1249064163471c44e6f4079c3147c219d0bc4c.tar.gz | |
up2date
| -rw-r--r-- | libxklavier/xklavier_evt_xmm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libxklavier/xklavier_evt_xmm.c b/libxklavier/xklavier_evt_xmm.c index 37994b0..0a94de1 100644 --- a/libxklavier/xklavier_evt_xmm.c +++ b/libxklavier/xklavier_evt_xmm.c @@ -15,18 +15,18 @@ static gint xkl_xmm_process_keypress_event( XKeyPressedEvent* kpe ) { xkl_debug( 200, "Processing the KeyPress event\n" ); gint current_shortcut = 0; - const XmmSwitchOptionPtr sop = xkl_xmm_switch_option_find( kpe->keycode, - kpe->state, - ¤t_shortcut ); + const XmmSwitchOption *sop = xkl_xmm_switch_option_find( kpe->keycode, + kpe->state, + ¤t_shortcut ); if( sop != NULL ) { xkl_debug( 150, "It is THE shortcut\n" ); XklState state; - xkl_xmm_state_get_real( &state ); + xkl_xmm_state_get_server( &state ); if( state.group != -1 ) { gint new_group = ( state.group + sop->shortcut_steps[current_shortcut] ) % - current_xmm_config.num_layouts; + g_strv_length (current_xmm_config.layouts); xkl_debug( 150, "Setting new xmm group %d\n", new_group ); xkl_xmm_group_lock( new_group ); return 1; @@ -46,7 +46,7 @@ static gint xkl_xmm_process_property_event( XPropertyEvent* kpe ) if( kpe->atom == xmm_state_atom ) { XklState state; - xkl_xmm_state_get_real( &state ); + xkl_xmm_state_get_server( &state ); if( xkl_listener_type & XKLL_MANAGE_LAYOUTS ) { |