Attachment #6724 for bug #9423

Lines 276-282 Link Here

(-)kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfig.cpp.orig (+16 lines)
276	}	276	}
277	case XftTypeString:	277	case XftTypeString:
278	str+="\"";	278	str+="\"";
		279	#ifndef XFT_WITH_FONTCONFIG
279	str+=test->value.u.s;	280	str+=test->value.u.s;
		281	#else
		282	str+=(const char *)test->value.u.s;
		283	#endif
280	str+="\"";	284	str+="\"";
281	break;	285	break;
282	case XftTypeBool:	286	case XftTypeBool:
Lines 554-560 Link Here
554	XftValue value;	558	XftValue value;
555	CXftConfig::TEntry *entry=new CXftConfig::TEntry;	559	CXftConfig::TEntry *entry=new CXftConfig::TEntry;
556		560
		561	#ifndef XFT_WITH_FONTCONFIG
557	value.u.s=sval;	562	value.u.s=sval;
		563	#else
		564	value.u.s=(FcChar8 *)sval;
		565	#endif
558	value.type=XftTypeString;	566	value.type=XftTypeString;
559	entry->test=XftTestCreate(XftQualAny, "family", XftOpEqual, value);	567	entry->test=XftTestCreate(XftQualAny, "family", XftOpEqual, value);
560		568
Lines 780-786 Link Here
780		788
781	for(entry=itsList.first(); entry; entry=itsList.next())	789	for(entry=itsList.first(); entry; entry=itsList.next())
782	if(entry->test && 0==CMisc::stricmp(entry->test->field, "family") && XftTypeString==entry->test->value.type &&	790	if(entry->test && 0==CMisc::stricmp(entry->test->field, "family") && XftTypeString==entry->test->value.type &&
		791	#ifndef XFT_WITH_FONTCONFIG
783	0==CMisc::stricmp(entry->test->value.u.s, family.latin1()) && entry->edit &&	792	0==CMisc::stricmp(entry->test->value.u.s, family.latin1()) && entry->edit &&
		793	#else
		794	0==CMisc::stricmp((const char *)entry->test->value.u.s, family.latin1()) && entry->edit &&
		795	#endif
784	0==CMisc::stricmp(entry->edit->field, field) && XftOpAssign==entry->edit->op && entry->edit->expr)	796	0==CMisc::stricmp(entry->edit->field, field) && XftOpAssign==entry->edit->op && entry->edit->expr)
785	break;	797	break;
786		798
Lines 798-804 Link Here
798	free(test->field);	810	free(test->field);
799		811
800	if(XftTypeString==test->value.type)	812	if(XftTypeString==test->value.type)
		813	#ifndef XFT_WITH_FONTCONFIG
801	free(test->value.u.s);	814	free(test->value.u.s);
		815	#else
		816	free((FcChar8 *)test->value.u.s);
		817	#endif
802	}	818	}
803	}	819	}
804		820

Lines 469-475 Link Here

(-)kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp.orig (+21 lines)
469	break;	469	break;
470	case XftTypeString:	470	case XftTypeString:
471	expr->op=XftOpString;	471	expr->op=XftOpString;
		472	#ifndef XFT_WITH_FONTCONFIG
472	expr->u.sval=val.u.s;	473	expr->u.sval=val.u.s;
		474	#else
		475	expr->u.sval=(char *)val.u.s;
		476	#endif
473	break;	477	break;
474	case XftTypeBool:	478	case XftTypeBool:
475	default:	479	default:
Lines 655-666 Link Here
655	if("foundry"==field \|\| "family"==field \|\| "encoding"==field \|\| "style"==field)	659	if("foundry"==field \|\| "family"==field \|\| "encoding"==field \|\| "style"==field)
656	{	660	{
657	val.type=XftTypeString;	661	val.type=XftTypeString;
		662	#ifndef XFT_WITH_FONTCONFIG
658	val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1);	663	val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1);
		664	#else
		665	val.u.s=(FcChar8 *)malloc(edit ? strVal.length()+1 : strVal.length()-1);
		666	#endif
659		667
660	if(edit)	668	if(edit)
		669	#ifndef XFT_WITH_FONTCONFIG
661	strcpy(val.u.s, strVal.local8Bit());	670	strcpy(val.u.s, strVal.local8Bit());
		671	#else
		672	strcpy((char *)val.u.s, strVal.local8Bit());
		673	#endif
662	else	674	else
		675	#ifndef XFT_WITH_FONTCONFIG
663	strcpy(val.u.s, strVal.mid(1, strVal.length()-2).local8Bit()); // Need to remove quotes from each end of the string...	676	strcpy(val.u.s, strVal.mid(1, strVal.length()-2).local8Bit()); // Need to remove quotes from each end of the string...
		677	#else
		678	strcpy((char *)val.u.s, strVal.mid(1, strVal.length()-2).local8Bit()); // Need to remove quotes from each end of the string...
		679	#endif
664	}	680	}
665	else if("spacing"==field)	681	else if("spacing"==field)
666	{	682	{
Lines 747-754 Link Here
747	{	763	{
748	// Not sure about this...	764	// Not sure about this...
749	val.type=XftTypeString;	765	val.type=XftTypeString;
		766	#ifndef XFT_WITH_FONTCONFIG
750	val.u.s=(char *)malloc(strVal.length()+1);	767	val.u.s=(char *)malloc(strVal.length()+1);
751	strcpy(val.u.s, strVal.local8Bit());	768	strcpy(val.u.s, strVal.local8Bit());
		769	#else
		770	val.u.s=(FcChar8 *)malloc(strVal.length()+1);
		771	strcpy((char *)val.u.s, strVal.local8Bit());
		772	#endif
752	}	773	}
753	else if("rgba"==field)	774	else if("rgba"==field)
754	{	775	{




XftSubstPrint (XftSubst *subst);

/* xftdir.c */
#ifndef HAVE_XFT2
Bool
XftDirScan (XftFontSet *set, const char *dir);
#endif

/* xftdpy.c */
int

XftListValueCompare (XftValue	v1,
		     XftValue	v2);

#ifndef HAVE_XFT2
Bool
XftListValueListCompare (XftValueList	*v1orig,
			 XftValueList	*v2orig,
			 XftQual	qual);
#endif

Bool
XftListMatch (XftPattern    *p,

Return to bug 9423

Lines 276-283 Link Here

(-)kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/xftint.h.orig (+4 lines)
276	XftSubstPrint (XftSubst *subst);	276	XftSubstPrint (XftSubst *subst);
277		277
278	/* xftdir.c */	278	/* xftdir.c */
		279	#ifndef HAVE_XFT2
279	Bool	280	Bool
280	XftDirScan (XftFontSet set, const char dir);	281	XftDirScan (XftFontSet set, const char dir);
		282	#endif
281		283
282	/* xftdpy.c */	284	/* xftdpy.c */
283	int	285	int
Lines 388-397 Link Here
388	XftListValueCompare (XftValue v1,	390	XftListValueCompare (XftValue v1,
389	XftValue v2);	391	XftValue v2);
390		392
		393	#ifndef HAVE_XFT2
391	Bool	394	Bool
392	XftListValueListCompare (XftValueList *v1orig,	395	XftListValueListCompare (XftValueList *v1orig,
393	XftValueList *v2orig,	396	XftValueList *v2orig,
394	XftQual qual);	397	XftQual qual);
		398	#endif
395		399
396	Bool	400	Bool
397	XftListMatch (XftPattern *p,	401	XftListMatch (XftPattern *p,