From: Daniel Stone <daniel@fooishbar.org>
Date: Thu, 22 Mar 2012 14:32:23 +0000 (+0000)
Subject: LEDs: Fix string comparison bug
X-Git-Tag: xkbcommon-0.2.0~713
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6c79ad0d82fddfa0c020e73337b4c92a72d9781;p=platform%2Fupstream%2Flibxkbcommon.git

LEDs: Fix string comparison bug

This resulted in duplicate sets of modifiers, since we were comparing
pointer equality of two strings, rather than string equality.  Oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
---

diff --git a/src/xkbcomp/indicators.c b/src/xkbcomp/indicators.c
index d1ecc75..55328c2 100644
--- a/src/xkbcomp/indicators.c
+++ b/src/xkbcomp/indicators.c
@@ -450,7 +450,9 @@ BindIndicators(struct xkb_desc * xkb, Bool force, LEDInfo *unbound,
             {
                 for (i = 0; i < XkbNumIndicators; i++)
                 {
-                    if (xkb->names->indicators[i] == XkbcAtomText(led->name))
+                    if (xkb->names->indicators[i] &&
+                        strcmp(xkb->names->indicators[i],
+                               XkbcAtomText(led->name)) == 0)
                     {
                         led->indicator = i + 1;
                         break;