one more file

1 files changed, 17 insertions, 17 deletions

diff --git a/libxklavier/xklavier_config_xmm.c b/libxklavier/xklavier_config_xmm.c
index d7cf564..900fd29 100644
--- a/libxklavier/xklavier_config_xmm.c
+++ b/libxklavier/xklavier_config_xmm.c
@@ -19,37 +19,37 @@
 #define XK_XKB_KEYS
 #include <X11/keysymdef.h>
 
-void _XklXmmConfigInit( void )
+void xkl_xmm_config_init( void )
 {
 }
 
-Bool _XklXmmConfigLoadRegistry( void )
+gboolean xkl_xmm_config_registry_load( void )
 {
-  struct stat statBuf;
-  char fileName[MAXPATHLEN] = "";
-  char* rf = _XklGetRulesSetName( "" );
+  struct stat stat_buf;
+  gchar file_name[MAXPATHLEN] = "";
+  gchar* rf = xkl_rules_set_get_name( "" );
 
   if ( rf == NULL || rf[0] == '\0' )
-    return False;
+    return FALSE;
 
-  snprintf( fileName, sizeof fileName, XMODMAP_BASE "/%s.xml", rf );
+  g_snprintf( file_name, sizeof file_name, XMODMAP_BASE "/%s.xml", rf );
 
-  if( stat( fileName, &statBuf ) != 0 )
+  if( stat( file_name, &stat_buf ) != 0 )
   {
-    _xklLastErrorMsg = "No rules file found";    
-    return False;
+    xkl_last_error_message = "No rules file found";    
+    return FALSE;
   }
 
-  return XklConfigLoadRegistryFromFile( fileName );
+  return xkl_config_registry_load_from_file( file_name );
 }
 
-Bool _XklXmmConfigActivate( const XklConfigRec * data )
+gboolean xkl_xmm_config_activate( const XklConfigRec *data )
 {
-  Bool rv;
-  rv = XklSetNamesProp( xklVTable->baseConfigAtom, 
-                        currentXmmRules, 
-                        data );
+  gboolean rv;
+  rv = xkl_set_names_prop( xkl_vtable->base_config_atom, 
+                           current_xmm_rules, 
+                           data );
   if( rv )
-    _XklXmmLockGroup( 0 );
+    xkl_xmm_group_lock( 0 );
   return rv;
 }