enable xkb next/prev and set actions. :)

SVN revision: 70613

diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index d28330c..5bbc155 100644 (file)
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -2675,17 +2675,17 @@ ACT_FN_GO(backlight_adjust, )
 ACT_FN_GO(kbd_layout, )
 {
    if (!params) return;
-//   e_xkb_layout_set(params);
+   e_xkb_layout_set(params);
 }
 
 ACT_FN_GO(kbd_layout_next, __UNUSED__)
 {
-//   e_xkb_layout_next();
+   e_xkb_layout_next();
 }
 
 ACT_FN_GO(kbd_layout_prev, __UNUSED__)
 {
-//   e_xkb_layout_prev();
+   e_xkb_layout_prev();
 }
 
 /* local subsystem globals */

diff --git a/src/bin/e_xkb.c b/src/bin/e_xkb.c
index acd3399..b5a217a 100644 (file)
--- a/src/bin/e_xkb.c
+++ b/src/bin/e_xkb.c
@@ -67,6 +67,10 @@ e_xkb_update(void)
         eina_strbuf_append(buf, "'");
      }
    
+   /* clear options */
+   eina_strbuf_append(buf, " -option ");
+   
+   /* add in selected options */
    EINA_LIST_FOREACH(e_config->xkb.used_options, l, op)
      {
         if (op->name)
@@ -86,7 +90,7 @@ e_xkb_layout_next(void)
 {  
    void *odata, *ndata;
    Eina_List *l;
-   
+
    odata = eina_list_data_get(e_config->xkb.used_layouts);
    
    EINA_LIST_FOREACH(eina_list_next(e_config->xkb.used_layouts), l, ndata)