debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into update-with-master

Browse Source 
Resync one last time with master for 2.3 release tomorrow.
This commit is contained in:
Jon Trulson
2018-07-05 14:18:07 -06:00
parent 16ee3d1be5 a7ec1c6182
commit 87ad4219da
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cde/programs/dtwm/WmResource.c
View File

@@ -4316,11 +4316,18 @@ MakeAppearanceResources (WmScreenData *pSD, AppearanceData *pAData, Boolean make
if (! XmeRenderTableGetDefaultFont(pAData->fontList, &(pAData->font)))
{
sprintf((char *)wmGD.tmpBuffer, ((char *)GETMESSAGE(62, 23, "failed to load font: %.100s\0")), (char*) pAData->fontList);
Warning((char *)wmGD.tmpBuffer);
#if 0
/* This always prints garbage on failure, which seems to
* always happen at least 1-3 times on startup.
*/
sprintf((char *)wmGD.tmpBuffer,
((char *)GETMESSAGE(62, 23, "failed to load font: %.100s\0")), (char*) pAData->fontList);
#endif
Warning("XmeRenderTableGetDefaultFont() failed, trying a fixed font");
#if defined(CSRG_BASED) || defined(__linux__)
/* HACK to try get _some_ font anyway (fontList seems to end up as an empty list on
* some modern systems; investigate) */
/* HACK to try get _some_ font anyway (fontList seems to end
* up as an empty list on some modern systems; investigate) */
pAData->font = XLoadQueryFont(wmGD.display, "fixed");
if (pAData->font == NULL)
{