ok = SetIndicatorMapField(&led, xkb, field.str, arrayNdx,
var->value) && ok;
}
+ free(elem.str);
+ free(field.str);
}
if (ok)
{
ERROR("No unnamed indicators found\n");
ACTION
("Virtual indicator map \"%s\" not bound\n",
- XkbcAtomGetString(led->name));
+ XkbcAtomText(led->name));
continue;
}
}
ERROR("Multiple names bound to indicator %d\n",
(unsigned int) led->indicator);
ACTION("Using %s, ignoring %s\n",
- XkbcAtomGetString(old),
- XkbcAtomGetString(led->name));
+ XkbcAtomText(old),
+ XkbcAtomText(led->name));
led->indicator = _LED_NotBound;
if (force)
{
return ReportBadType("indicator", "name", buf, "string");
}
ii.name = XkbcInternAtom(tmp.str, False);
+ free(tmp.str);
ii.virtual = def->virtual;
if (!AddIndicatorName(info, &ii))
return False;
for (ii = info.leds; ii != NULL;
ii = (IndicatorNameInfo *) ii->defs.next)
{
- xkb->names->indicators[ii->ndx - 1] =
- XkbcInternAtom(XkbcAtomGetString(ii->name), False);
+ xkb->names->indicators[ii->ndx - 1] = ii->name;
if (xkb->indicators != NULL)
{
register unsigned bit;