Hi,

when some of layouts are in 'basic' variant and some are not,
setxkbmap command is wrongly constructed as 'basic' is ommited without
comma. Attached patch will produce comma for that case.

Please apply the fix.

Best regards,

Tomas Cech
Sleep_Walker

From 447e0fe2050a751e4ca0448f17013958f648ec21 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_wal...@suse.cz>
Date: Fri, 28 Dec 2012 16:38:57 +0100
Subject: [PATCH] E_XKB: write comma when ommiting 'basic' variant as a
 parameter
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

use at least comma so the number of variants is the same
see (ticket #2119)

Signed-off-by: Tomáš Čech <sleep_wal...@suse.cz>
---
 e/src/bin/e_xkb.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/e/src/bin/e_xkb.c b/e/src/bin/e_xkb.c
index c289da1..e1984da 100644
--- a/e/src/bin/e_xkb.c
+++ b/e/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, ",");
                }
-- 
1.7.10.4

Attachment: signature.asc
Description: Digital signature

------------------------------------------------------------------------------
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to