diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-05-24 09:04:43 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-05-24 09:04:43 +0200 |
| commit | 11b534ab008f9f0ac831d96f0426adf4c3561319 (patch) | |
| tree | 07aab99bf9e98ea7a25c175d5df43da673ebdebd /nx-X11/programs/Xserver/hw/nxagent/Font.c | |
| parent | 997f2bbd2d27e154b6e44f9936b2b407a74c8664 (diff) | |
| parent | cce9756545ab266ccff7ec363907aa25f4d7c1c7 (diff) | |
| download | nx-libs-11b534ab008f9f0ac831d96f0426adf4c3561319.tar.gz nx-libs-11b534ab008f9f0ac831d96f0426adf4c3561319.tar.bz2 nx-libs-11b534ab008f9f0ac831d96f0426adf4c3561319.zip | |
Merge branch 'uli42-pr/codespell' into 3.6.x
Attributes GH PR #686: https://github.com/ArcticaProject/nx-libs/pull/686
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Font.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Font.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 72c5eb9d0..a1690ebb8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -245,7 +245,7 @@ void nxagentListRemoteFonts(const char *searchPattern, const int maxNames) * number of dashes in the pattern acts as * a rule to select how to search for the * font names, so the pattern '*' is useful - * to retrive the font aliases, while the + * to retrieve the font aliases, while the * other one will select the 'real' fonts. */ @@ -717,7 +717,7 @@ int nxagentDestroyNewFontResourceType(void * p, XID id) /* FIXME: It happens that this resource had been already - destroied. We should verify if the same font is + destroyed. We should verify if the same font is assigned both to the server client and another client. We had a crash when freeing server client resources. @@ -788,7 +788,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP numSearchFields = nxagentSplitString(nxagentRemoteFontList.list[i]->name, searchFields, FIELDS+1, "-"); - /* The following code attemps to find an accurate approximation + /* The following code attempts to find an accurate approximation * of the missing font. The current candidate and the missing font are * compared on the 14 fields of the X Logical Font Description Convention. * The selection is performed by the analysis of the matching fields, |