Discomfitor told me to include ChangeLog and NEWS entry, so they're part of new attached patch now.
Cheers, Sleep_Walker
From 52ec46341f7b2c1a6239b929afb637d0c14b318f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <[email protected]> Date: Fri, 28 Dec 2012 22:48:30 +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 as number of layouts see (ticket #2119) Signed-off-by: Tomáš Čech <[email protected]> --- e/ChangeLog | 3 +++ e/NEWS | 5 +++++ e/src/bin/e_xkb.c | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/e/ChangeLog b/e/ChangeLog index 33b3181..73e475d 100644 --- a/e/ChangeLog +++ b/e/ChangeLog @@ -1,3 +1,6 @@ +2012-12-28 trunk + * Fix construction of variant list for setxkbmap + 2012-12-21 Initial release diff --git a/e/NEWS b/e/NEWS index e69de29..8cc7b4f 100644 --- a/e/NEWS +++ b/e/NEWS @@ -0,0 +1,5 @@ +Changes since 0.17.0: +--------------------- + +Fixes: + * Fix construction of variant list for setxkbmap 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
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 [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
