backport previous xkb commit

SVN revision: 81850

ChangeLog

@@ -1,3 +1,7 @@
+2012-12-28 Tomas Cech
+
+        * Fix construction of variant list for setxkbmap
+
 2012-12-28  Carsten Haitzler
 
         * Increased maximum menu size, improved menu autoscrolling

NEWS

@@ -14,3 +14,4 @@ Fixes:
     * Fixed crash when changing ibar source
     * Fixed SIGFPE in tiling module and functionality of toggle_rows_count
     * Fixed error in Evry when trying to call edje functions on non-edje object
+    * Fix construction of variant list for setxkbmap

src/bin/e_xkb.c

@@ -78,9 +78,8 @@ e_xkb_update(int cur_group)
         eina_strbuf_append(buf, "' -variant '");
         EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
           {
-             if (cl->variant)
+             if ((cl->variant) && (strcmp(cl->variant, "basic")))
                {
-                  if (!strcmp(cl->variant, "basic")) continue;
                   eina_strbuf_append(buf, cl->variant);
                   eina_strbuf_append(buf, ",");
                }