From c0e8aa4c2a1c19e5bda4947b45a2f4c13d81a9d1 Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Fri, 3 Nov 2006 14:32:51 +0000 Subject: [PATCH] iassume ascii as fallback encoding if registry mapping fails. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24026 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/xlib/XGFont.m | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 699c4af..ba55a88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-03 Richard Frith-Macdonald + + * Source/xlib/XGFont.m: Assume ascii encoding as a fallback if no + mapping can be found from the font registry to the encoding. + 2006-10-31 Matt Rice * Source/x11/XGServerEvent.m (_handleTakeFocusAtom:forContext:): diff --git a/Source/xlib/XGFont.m b/Source/xlib/XGFont.m index 0078440..984dfed 100644 --- a/Source/xlib/XGFont.m +++ b/Source/xlib/XGFont.m @@ -332,6 +332,10 @@ static BOOL XGInitAtoms(Display *dpy) = [GSMimeDocument encodingFromCharset: encodingScheme]; NSDebugLog(@"Found encoding %d for %@", mostCompatibleStringEncoding, encodingScheme); + if (mostCompatibleStringEncoding == GSUndefinedEncoding) + { + mostCompatibleStringEncoding = NSASCIIStringEncoding; + } RETAIN(encodingScheme); } }