a lot of typos fixed, so missing functions should be in place

10 files changed, 47 insertions, 47 deletions

diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c
index 117c3ab..1b45f70 100644
--- a/libxklavier/xklavier.c
+++ b/libxklavier/xklavier.c
@@ -15,9 +15,9 @@ Window xkl_current_client;
 
 Status xkl_last_error_code;
 
-const gchar *xkl_last_error_msg;
+const gchar *xkl_last_error_message;
 
-XErrorHandler xkl_default_err_handler;
+XErrorHandler xkl_default_error_handler;
 
 Atom xkl_atoms[TOTAL_ATOMS];
 
@@ -87,7 +87,7 @@ static void xkl_set_switch_to_secondary_group( gboolean val )
   XSync( xkl_display, False );
 }
 
-void _xkl_allow_one_switch_to_secondary_group( void )
+void xkl_group_allow_one_switch_to_secondary( void )
 {
   xkl_debug( 150, "Setting allow_one_switch_to_secondary_group flag\n" );
   xkl_set_switch_to_secondary_group( TRUE );
@@ -215,7 +215,7 @@ gint xkl_init( Display * a_dpy )
     return -1;
   }
 
-  xkl_default_err_handler =
+  xkl_default_error_handler =
     XSetErrorHandler( ( XErrorHandler ) xkl_process_error );
 
   xkl_display = a_dpy;
@@ -267,7 +267,7 @@ gint xkl_init( Display * a_dpy )
 
 gint xkl_term( void )
 {
-  XSetErrorHandler( ( XErrorHandler ) xkl_default_err_handler );
+  XSetErrorHandler( ( XErrorHandler ) xkl_default_error_handler );
   xkl_config_callback = NULL;
   xkl_state_callback = NULL;
   xkl_new_window_callback = NULL;
@@ -278,7 +278,7 @@ gint xkl_term( void )
   return 0;
 }
 
-gboolean xkl_grab_key( gint keycode, guint modifiers )
+gboolean xkl_key_grab( gint keycode, guint modifiers )
 {
   gboolean ret_code;
   gchar *keyname;
@@ -305,12 +305,12 @@ gboolean xkl_grab_key( gint keycode, guint modifiers )
   ret_code = ( xkl_last_error_code == Success );
 
   if( !ret_code )
-    xkl_last_error_msg = "Could not grab the key";
+    xkl_last_error_message = "Could not grab the key";
 
   return ret_code;
 }
 
-gboolean xkl_ungrab_key( gint keycode, guint modifiers )
+gboolean xkl_key_ungrab( gint keycode, guint modifiers )
 {
   if( 0 == keycode )
     return FALSE;
@@ -318,7 +318,7 @@ gboolean xkl_ungrab_key( gint keycode, guint modifiers )
   return Success == XUngrabKey( xkl_display, keycode, 0, xkl_root_window );
 }
 
-gint _xkl_get_next_group( void )
+gint xkl_group_get_next( void )
 {
   return ( xkl_current_state.group + 1 ) % xkl_groups_get_num(  );
 }
@@ -362,7 +362,7 @@ void xkl_set_transparent( Window win, gboolean transparent )
   xkl_toplevel_window_set_transparent( toplevel_win, transparent );
 }
 
-gboolean xkl_is_transparent( Window win )
+gboolean xkl_window_is_transparent( Window win )
 {
   Window toplevel_win;
 
@@ -505,12 +505,12 @@ void xkl_ensure_vtable_inited( void )
   }
 }
 
-const gchar *xkl_get_backend_name( void )
+const gchar *xkl_backend_get_name( void )
 {
   return xkl_vtable->id;
 }
 
-guint xkl_get_backend_features( void )
+guint xkl_backend_get_features( void )
 {
   return xkl_vtable->features;
 }
@@ -536,7 +536,7 @@ const gchar **xkl_groups_get_names( void )
   return (*xkl_vtable->groups_get_names_func)();
 }
 
-guint _xkl_groups_get_num( void )
+guint xkl_groups_get_num( void )
 {
   xkl_ensure_vtable_inited();
   return (*xkl_vtable->groups_get_num_func)();
diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c
index be13153..e2dc30e 100644
--- a/libxklavier/xklavier_config.c
+++ b/libxklavier/xklavier_config.c
@@ -286,21 +286,21 @@ void xkl_strings_split_comma_separated( gchar ***array, const gchar *merged )
   *array = g_strsplit( merged, ",", 0);
 }
 
-gchar* xkl_get_rules_set_name( const gchar default_ruleset[] )
+gchar* xkl_rules_set_get_name( const gchar default_ruleset[] )
 {
-  static char rules_set_name[1024] = "";
+  static gchar rules_set_name[1024] = "";
   if ( !rules_set_name[0] )
   {
     /* first call */
-    char* rf = NULL;
+    gchar* rf = NULL;
     if( !xkl_get_names_prop( xkl_vtable->base_config_atom, &rf, NULL ) ||
         ( rf == NULL ) )
     {
-      strncpy( rules_set_name, default_ruleset, sizeof rules_set_name );
+      g_strlcpy( rules_set_name, default_ruleset, sizeof rules_set_name );
       xkl_debug( 100, "Using default rules set: [%s]\n", rules_set_name );
       return rules_set_name;
     }
-    strncpy( rules_set_name, rf, sizeof rules_set_name );
+    g_strlcpy( rules_set_name, rf, sizeof rules_set_name );
     g_free( rf );
   }
   xkl_debug( 100, "Rules set: [%s]\n", rules_set_name );
@@ -339,7 +339,7 @@ void xkl_config_term( void )
   }
 }
 
-gboolean xkl_config_load_registry_from_file( const gchar * file_name )
+gboolean xkl_config_registry_load_from_file( const gchar * file_name )
 {
   the_registry.doc = xmlParseFile( file_name );
   if( the_registry.doc == NULL )
@@ -351,7 +351,7 @@ gboolean xkl_config_load_registry_from_file( const gchar * file_name )
   return xkl_config_registry_is_initialized(  );
 }
 
-void xkl_config_free_registry( void )
+void xkl_config_registry_free( void )
 {
   if( xkl_config_registry_is_initialized(  ) )
   {
diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c
index 35748cb..bc41f67 100644
--- a/libxklavier/xklavier_config_xkb.c
+++ b/libxklavier/xklavier_config_xkb.c
@@ -314,7 +314,7 @@ void _XklXkbConfigCleanupNative( gpointer componentNamesPtr )
 #endif
 
 /* check only client side support */
-gboolean _XklXkbConfigMultipleLayoutsSupported( void )
+gboolean xkl_xkb_config_multiple_layouts_supported( void )
 {
   enum { NON_SUPPORTED, SUPPORTED, UNCHECKED };
 
diff --git a/libxklavier/xklavier_evt.c b/libxklavier/xklavier_evt.c
index f77280a..e5093d3 100644
--- a/libxklavier/xklavier_evt.c
+++ b/libxklavier/xklavier_evt.c
@@ -247,7 +247,7 @@ void xkl_process_focus_out_evt( XFocusChangeEvent * fev )
  *    - WM_STATE property for all windows
  *    - Configuration property of the root window
  */
-void xkl_provess_property_evt( XPropertyEvent * pev )
+void xkl_process_property_evt( XPropertyEvent * pev )
 {
   if( 400 <= xkl_debug_level )
   {
@@ -306,7 +306,7 @@ void xkl_provess_property_evt( XPropertyEvent * pev )
 /**
  * CreateNotify handler. Just interested in properties and focus events...
  */
-void xkl_process_create_evt( XCreateWindowEvent * cev )
+void xkl_process_create_window_evt( XCreateWindowEvent * cev )
 {
   if( !( xkl_listener_type & XKLL_MANAGE_WINDOW_STATES ) )
     return;
diff --git a/libxklavier/xklavier_evt_xkb.c b/libxklavier/xklavier_evt_xkb.c
index 3996206..ec92e5c 100644
--- a/libxklavier/xklavier_evt_xkb.c
+++ b/libxklavier/xklavier_evt_xkb.c
@@ -97,7 +97,7 @@ gint xkl_xkb_process_x_event( XEvent *xev )
 #endif
     case XkbNewKeyboardNotify:
       xkl_debug( 150, "%s\n",
-                 xkl_xkb_get_xkb_event_name( kev->any.xkb_type ) );
+                 xkl_xkb_event_get_name( kev->any.xkb_type ) );
       xkl_reset_all_info( "XKB event: XkbNewKeyboardNotify" );
       break;
 
@@ -106,7 +106,7 @@ gint xkl_xkb_process_x_event( XEvent *xev )
      */
     default:
       xkl_debug( 150, "Unknown XKB event %d [%s]\n", 
-                kev->any.xkb_type, xkl_xkb_get_xkb_event_name( kev->any.xkb_type ) );
+                kev->any.xkb_type, xkl_xkb_event_get_name( kev->any.xkb_type ) );
       return 0;
   }
   return 1;
diff --git a/libxklavier/xklavier_private_xkb.h b/libxklavier/xklavier_private_xkb.h
index d61c62d..64bd179 100644
--- a/libxklavier/xklavier_private_xkb.h
+++ b/libxklavier/xklavier_private_xkb.h
@@ -21,7 +21,7 @@ extern void xkl_dump_xkb_desc( const char *file_name,
 
 extern gboolean xkl_xkb_config_multiple_layouts_supported( void );
 
-extern const gchar *xkl_xkb_get_xkb_event_name( gint xkb_type );
+extern const gchar *xkl_xkb_event_get_name( gint xkb_type );
 
 extern gboolean xkl_xkb_config_native_prepare( const XklConfigRec *data, 
                                                XkbComponentNamesPtr component_names );
diff --git a/libxklavier/xklavier_toplevel.c b/libxklavier/xklavier_toplevel.c
index ea37a8d..d8ab632 100644
--- a/libxklavier/xklavier_toplevel.c
+++ b/libxklavier/xklavier_toplevel.c
@@ -14,7 +14,7 @@ void xkl_toplevel_window_set_transparent( Window toplevel_win,
 {
   gboolean oldval;
 
-  oldval = xkl_is_transparent( toplevel_win );
+  oldval = xkl_window_is_transparent( toplevel_win );
   xkl_debug( 150, "toplevel_win " WINID_FORMAT " was %stransparent\n", 
                   toplevel_win, oldval ? "" : "not " );
   if( transparent && !oldval )
@@ -48,7 +48,7 @@ void xkl_toplevel_window_add( Window toplevel_win, Window parent,
     xkl_debug( 150, "??? root app win ???\n" );
 
   xkl_debug( 150, "Trying to add window " WINID_FORMAT "/%s with group %d\n",
-                  toplevel_win, xkl_get_debug_window_title( toplevel_win), 
+                  toplevel_win, xkl_window_get_debug_title( toplevel_win), 
                   init_state->group );
 
   if( !ignore_existing_state )
@@ -84,8 +84,8 @@ void xkl_toplevel_window_add( Window toplevel_win, Window parent,
     if( xkl_current_client == toplevel_win )
     {
       if( ( xkl_secondary_groups_mask & ( 1 << default_group_to_use ) ) != 0 )
-        xkl_allow_one_switch_to_secondary_group();
-      xkl_lock_group( default_group_to_use );
+        xkl_group_allow_one_switch_to_secondary();
+      xkl_group_lock( default_group_to_use );
     }
   }
 
@@ -111,14 +111,14 @@ gboolean xkl_toplevel_window_find_bottom_to_top( Window win,
     return FALSE;
   }
 
-  if( xkl_has_wm_state( win ) )
+  if( xkl_window_has_wm_state( win ) )
   {
     *toplevel_win_out = win;
     return TRUE;
   }
 
   xkl_last_error_code =
-    xkl_status_query_tree( xkl_display, win, &rwin, &parent, &children, &num );
+    xkl_status_query_tree( win, &rwin, &parent, &children, &num );
 
   if( xkl_last_error_code != Success )
   {
@@ -157,14 +157,14 @@ gboolean xkl_toplevel_window_find( Window win, Window * toplevel_win_out )
     return FALSE;
   }
 
-  if( xkl_has_wm_state( win ) )
+  if( xkl_window_has_wm_state( win ) )
   {
     *toplevel_win_out = win;
     return TRUE;
   }
 
   xkl_last_error_code =
-    xkl_status_query_tree( xkl_display, win, &rwin, &parent, &children, &num );
+    xkl_status_query_tree( win, &rwin, &parent, &children, &num );
 
   if( xkl_last_error_code != Success )
   {
@@ -182,7 +182,7 @@ gboolean xkl_toplevel_window_find( Window win, Window * toplevel_win_out )
   child = children;
   while( num )
   {
-    if( xkl_has_wm_state( *child ) )
+    if( xkl_window_has_wm_state( *child ) )
     {
       *toplevel_win_out = *child;
       if( children != NULL )
@@ -200,7 +200,7 @@ gboolean xkl_toplevel_window_find( Window win, Window * toplevel_win_out )
 
   if( !rv )
     xkl_debug( 200, "Could not get the app window for " WINID_FORMAT "/%s\n",
-              win, xkl_get_debug_window_title( win ) );
+               win, xkl_window_get_debug_title( win ) );
 
   return rv;
 }
@@ -227,7 +227,7 @@ gboolean xkl_toplevel_window_get_state( Window toplevel_win, XklState * state_ou
       && ( type_ret == XA_INTEGER ) && ( format_ret == 32 ) )
   {
     grp = prop[0];
-    if( grp >= xkl_get_num_groups(  ) || grp < 0 )
+    if( grp >= xkl_groups_get_num(  ) || grp < 0 )
       grp = 0;
                                                                                             
     inds = prop[1];
@@ -247,10 +247,10 @@ gboolean xkl_toplevel_window_get_state( Window toplevel_win, XklState * state_ou
     xkl_debug( 150,
               "Appwin " WINID_FORMAT
               ", '%s' has the group %d, indicators %X\n", toplevel_win,
-              xkl_get_debug_window_title( toplevel_win ), grp, inds );
+              xkl_window_get_debug_title( toplevel_win ), grp, inds );
   else
     xkl_debug( 150, "Appwin " WINID_FORMAT ", '%s' does not have state\n",
-              toplevel_win, xkl_get_debug_window_title( toplevel_win ) );
+               toplevel_win, xkl_window_get_debug_title( toplevel_win ) );
                                                                                             
   return ret;
 }
diff --git a/libxklavier/xklavier_util.c b/libxklavier/xklavier_util.c
index feb35d1..8b77949 100644
--- a/libxklavier/xklavier_util.c
+++ b/libxklavier/xklavier_util.c
@@ -12,7 +12,7 @@ XklState *xkl_state_get_current(  )
   return &xkl_current_state;
 }
 
-const gchar *_xkl_get_last_error(  )
+const gchar *xkl_get_last_error(  )
 {
   return xkl_last_error_message;
 }
@@ -102,7 +102,7 @@ Window xkl_window_get_current(  )
  * All the windows with WM_STATE are added.
  * All the windows within level 0 are listened for focus and property
  */
-gboolean __xkl_load_subtree( Window window, gint level, XklState * init_state )
+gboolean xkl_load_subtree( Window window, gint level, XklState * init_state )
 {
   Window rwin = ( Window ) NULL,
     parent = ( Window ) NULL, *children = NULL, *child;
diff --git a/libxklavier/xklavier_xkb.c b/libxklavier/xklavier_xkb.c
index a3d3e90..4ca88de 100644
--- a/libxklavier/xklavier_xkb.c
+++ b/libxklavier/xklavier_xkb.c
@@ -20,12 +20,12 @@ gint xkl_xkb_event_type, xkl_xkb_error_code;
 
 static gchar *group_names[XkbNumKbdGroups];
 
-const gchar **xkl_xkb_get_group_names( void )
+const gchar **xkl_xkb_groups_get_names( void )
 {
   return ( const gchar ** ) group_names;
 }
 
-gint xkl_xkb_pause_listen( void )
+gint xkl_xkb_listen_pause( void )
 {
   XkbSelectEvents( xkl_display, XkbUseCoreKbd, XkbAllEventsMask, 0 );
 /*  XkbSelectEventDetails( xkl_display,
@@ -39,7 +39,7 @@ gint xkl_xkb_pause_listen( void )
   return 0;
 }
 
-gint xkl_xkb_resume_listen( void )
+gint xkl_xkb_listen_resume( void )
 {
   /* What events we want */
 #define XKB_EVT_MASK \
@@ -257,7 +257,7 @@ gboolean xkl_xkb_load_all_info( void )
   return TRUE;
 }
 
-void _XklXkbLockGroup( int group )
+void xkl_xkb_group_lock( int group )
 {
   xkl_debug( 100, "Posted request for change the group to %d ##\n", group );
   XkbLockGroup( xkl_display, XkbUseCoreKbd, group );
@@ -286,7 +286,7 @@ void xkl_xkb_get_server_state( XklState * current_state_out )
 /*
  * Actually taken from mxkbledpanel, valueChangedProc
  */
-gboolean xkl_set_indicator( gint indicator_num, gboolean set )
+gboolean xkl_indicator_set( gint indicator_num, gboolean set )
 {
   XkbIndicatorMapPtr map;
 
diff --git a/libxklavier/xklavier_xmm.c b/libxklavier/xklavier_xmm.c
index 79215ff..093e3a3 100755
--- a/libxklavier/xklavier_xmm.c
+++ b/libxklavier/xklavier_xmm.c
@@ -45,7 +45,7 @@ void xkl_xmm_shortcuts_grab( void )
   }
 }
 
-void xkl_xmm_ungrab_shortcuts( void )
+void xkl_xmm_shortcuts_ungrab( void )
 {
   const XmmShortcut *shortcut;
   const XmmSwitchOption *option = xkl_xmm_shortcut_get_current();