diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-02 11:01:43 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-02 11:01:43 +0100 |
| commit | 554a6fa760de47c497abcc91bb5f1f9b2756a407 (patch) | |
| tree | f59b0c8ddd14dc414c952710b2010477107cde06 /nx-X11/programs/Xserver/hw/nxagent/Font.c | |
| parent | f42d36fb73e096113a948a04279b752689f157bc (diff) | |
| parent | 9c3669c6b7ff19013b3684bb74d98ec3d121e329 (diff) | |
| download | nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.tar.gz nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.tar.bz2 nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.zip | |
Merge branch 'sunweaver-pr/constify-atom-name-strings' into 3.6.x
Attributes GH PR #363: https://github.com/ArcticaProject/nx-libs/pull/363
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 c9b9e3f75..97a90e176 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -491,7 +491,7 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) int nprops; FontPropPtr props; int i; - char *name; + const char *name; char *origName = (char*) pScreen; FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL); @@ -513,7 +513,7 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) if (!value_atom) return False; - name = (char *)NameForAtom(value_atom); + name = NameForAtom(value_atom); #ifdef NXAGENT_FONTCACHE_DEBUG fprintf(stderr, "Font: nxagentRealizeFont, realizing font: %s\n", validateString(name)); @@ -602,7 +602,7 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) nxagentListRemoteFonts("*", nxagentMaxFontNames); } - nxagentFontPriv(pFont)->font_struct = nxagentLoadQueryFont(nxagentDisplay, name, pFont); + nxagentFontPriv(pFont)->font_struct = nxagentLoadQueryFont(nxagentDisplay, (char *)name, pFont); strcpy(nxagentFontPriv(pFont)->fontName, name); if (nxagentFontPriv(pFont)->font_struct != NULL) { |