Attachment #5191 for bug #9423




            }
            case XftTypeString:
                str+="\"";
                str+=(QCString &)test->value.u.s;
                str+="\"";
                break;
            case XftTypeBool:

    XftValue           value;
    CXftConfig::TEntry *entry=new CXftConfig::TEntry;

    (char *)value.u.s=sval;
    value.type=XftTypeString;
    entry->test=XftTestCreate(XftQualAny, "family", XftOpEqual, value);



    for(entry=itsList.first(); entry; entry=itsList.next())
        if(entry->test && 0==CMisc::stricmp(entry->test->field, "family") && XftTypeString==entry->test->value.type &&
           0==CMisc::stricmp((char *)entry->test->value.u.s, family.latin1()) && entry->edit &&
           0==CMisc::stricmp(entry->edit->field, field) && XftOpAssign==entry->edit->op && entry->edit->expr)
            break;


            free(test->field);

        if(XftTypeString==test->value.type)
            free((void *)test->value.u.s);
    }
}





                    break;
                case XftTypeString:
                    expr->op=XftOpString;
                    expr->u.sval=(char *)val.u.s;
                    break;
                case XftTypeBool:
                default:

    if("foundry"==field || "family"==field || "encoding"==field || "style"==field)
    {
        val.type=XftTypeString;
        (char *)val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1);

        if(edit)
            strcpy((char *)val.u.s, strVal.local8Bit());
        else
            strcpy((char *)val.u.s, strVal.mid(1, strVal.length()-2).local8Bit());  // Need to remove quotes from each end of the string...
    }
    else if("spacing"==field)
    {

        {
            // Not sure about this...
            val.type=XftTypeString;
            (char *)val.u.s=(char *)malloc(strVal.length()+1);
            strcpy((char *)val.u.s, strVal.local8Bit());
        }
        else if("rgba"==field)
        {

Return to bug 9423

Lines 276-282 Link Here

(-)kdebase-3.0.4/kcontrol/kfontinst/kfontinst/XftConfig.cpp.orig (-4 / +4 lines)
276	}	276	}
277	case XftTypeString:	277	case XftTypeString:
278	str+="\"";	278	str+="\"";
279	str+=test->value.u.s;	279	str+=(QCString &)test->value.u.s;
280	str+="\"";	280	str+="\"";
281	break;	281	break;
282	case XftTypeBool:	282	case XftTypeBool:
Lines 554-560 Link Here
554	XftValue value;	554	XftValue value;
555	CXftConfig::TEntry *entry=new CXftConfig::TEntry;	555	CXftConfig::TEntry *entry=new CXftConfig::TEntry;
556		556
557	value.u.s=sval;	557	(char *)value.u.s=sval;
558	value.type=XftTypeString;	558	value.type=XftTypeString;
559	entry->test=XftTestCreate(XftQualAny, "family", XftOpEqual, value);	559	entry->test=XftTestCreate(XftQualAny, "family", XftOpEqual, value);
560		560
Lines 780-786 Link Here
780		780
781	for(entry=itsList.first(); entry; entry=itsList.next())	781	for(entry=itsList.first(); entry; entry=itsList.next())
782	if(entry->test && 0==CMisc::stricmp(entry->test->field, "family") && XftTypeString==entry->test->value.type &&	782	if(entry->test && 0==CMisc::stricmp(entry->test->field, "family") && XftTypeString==entry->test->value.type &&
783	0==CMisc::stricmp(entry->test->value.u.s, family.latin1()) && entry->edit &&	783	0==CMisc::stricmp((char *)entry->test->value.u.s, family.latin1()) && entry->edit &&
784	0==CMisc::stricmp(entry->edit->field, field) && XftOpAssign==entry->edit->op && entry->edit->expr)	784	0==CMisc::stricmp(entry->edit->field, field) && XftOpAssign==entry->edit->op && entry->edit->expr)
785	break;	785	break;
786		786
Lines 798-804 Link Here
798	free(test->field);	798	free(test->field);
799		799
800	if(XftTypeString==test->value.type)	800	if(XftTypeString==test->value.type)
801	free(test->value.u.s);	801	free((void *)test->value.u.s);
802	}	802	}
803	}	803	}
804		804

Lines 469-475 Link Here

(-)kdebase-3.0.4/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp.orig (-6 / +6 lines)
469	break;	469	break;
470	case XftTypeString:	470	case XftTypeString:
471	expr->op=XftOpString;	471	expr->op=XftOpString;
472	expr->u.sval=val.u.s;	472	expr->u.sval=(char *)val.u.s;
473	break;	473	break;
474	case XftTypeBool:	474	case XftTypeBool:
475	default:	475	default:
Lines 655-666 Link Here
655	if("foundry"==field \|\| "family"==field \|\| "encoding"==field \|\| "style"==field)	655	if("foundry"==field \|\| "family"==field \|\| "encoding"==field \|\| "style"==field)
656	{	656	{
657	val.type=XftTypeString;	657	val.type=XftTypeString;
658	val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1);	658	(char )val.u.s=(char )malloc(edit ? strVal.length()+1 : strVal.length()-1);
659		659
660	if(edit)	660	if(edit)
661	strcpy(val.u.s, strVal.local8Bit());	661	strcpy((char *)val.u.s, strVal.local8Bit());
662	else	662	else
663	strcpy(val.u.s, strVal.mid(1, strVal.length()-2).local8Bit()); // Need to remove quotes from each end of the string...	663	strcpy((char *)val.u.s, strVal.mid(1, strVal.length()-2).local8Bit()); // Need to remove quotes from each end of the string...
664	}	664	}
665	else if("spacing"==field)	665	else if("spacing"==field)
666	{	666	{
Lines 747-754 Link Here
747	{	747	{
748	// Not sure about this...	748	// Not sure about this...
749	val.type=XftTypeString;	749	val.type=XftTypeString;
750	val.u.s=(char *)malloc(strVal.length()+1);	750	(char )val.u.s=(char )malloc(strVal.length()+1);
751	strcpy(val.u.s, strVal.local8Bit());	751	strcpy((char *)val.u.s, strVal.local8Bit());
752	}	752	}
753	else if("rgba"==field)	753	else if("rgba"==field)
754	{	754	{