#include "e.h"
#include "e_mod_main.h"
#include "e_mod_config.h"
#include "e_kbd_int.h"

/* local variables */
static E_Kbd_Int *ki = NULL;

EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume Keyboard" };

EAPI void *
e_modapi_init(E_Module *m) 
{
   if (!il_kbd_config_init(m)) return NULL;

   ki = e_kbd_int_new(il_kbd_cfg->mod_dir, 
                      il_kbd_cfg->mod_dir, il_kbd_cfg->mod_dir);

   return m;
}

EAPI int 
e_modapi_shutdown(E_Module *m) 
{
   if (ki) 
     {
        e_kbd_int_free(ki);
        ki = NULL;
     }
   il_kbd_config_shutdown();
   return 1;
}

EAPI int 
e_modapi_save(E_Module *m) 
{
   return il_kbd_config_save();
}

#include "e.h"
#include "e_mod_main.h"
#include "e_mod_config.h"
#include "e_kbd_int.h"

/* local variables */
static E_Kbd_Int *ki = NULL;

EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume Keyboard" };

EAPI void *
e_modapi_init(E_Module *m) 
{
   if (!il_kbd_config_init(m)) return NULL;

   ki = e_kbd_int_new(mod_dir, mod_dir, mod_dir);

   return m;
}

EAPI int 
e_modapi_shutdown(E_Module *m) 
{
   if (ki) 
     {
        e_kbd_int_free(ki);
        ki = NULL;
     }
   il_kbd_config_shutdown();
   return 1;
}

EAPI int 
e_modapi_save(E_Module *m) 
{
   return il_kbd_config_save();
}

--- 
+++ 
@@ -13,7 +13,8 @@
 {
    if (!il_kbd_config_init(m)) return NULL;
 
-   ki = e_kbd_int_new(mod_dir, mod_dir, mod_dir);
+   ki = e_kbd_int_new(il_kbd_cfg->mod_dir, 
+                      il_kbd_cfg->mod_dir, il_kbd_cfg->mod_dir);
 
    return m;
 }
Use correct module directory when making keyboard.
Previous commit fixed compiler warnings also.



git-svn-id: 6ac5796aeae0cef97fb47bcc287d4ce899c6fa6e@43875 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
