diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2007-06-16 10:41:21 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2007-06-16 10:41:21 +0200 |
commit | b532dc82299d1a11b5bdbbbee17f614dd87e8307 (patch) | |
tree | 26e67a6b9f0ef901f7df1e2213b9deb450aea40c /menu.c | |
parent | 81e44bce198d53d0515290724c0ec8f989b9e01d (diff) | |
download | vdr-b532dc82299d1a11b5bdbbbee17f614dd87e8307.tar.gz vdr-b532dc82299d1a11b5bdbbbee17f614dd87e8307.tar.bz2 |
Replaced strncpy() and strn0cpy() with Utf8Strn0Cpy() where necessary
Diffstat (limited to 'menu.c')
-rw-r--r-- | menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.451 2007/06/09 14:36:46 kls Exp $ + * $Id: menu.c 1.452 2007/06/16 09:33:21 kls Exp $ */ #include "menu.h" @@ -2239,14 +2239,14 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key) if (skinIndex != originalSkinIndex) { cSkin *Skin = Skins.Get(skinIndex); if (Skin) { - strn0cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin)); + Utf8Strn0Cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin)); Skins.SetCurrent(Skin->Name()); ModifiedApperance = true; } } if (themes.NumThemes() && Skins.Current()->Theme()) { Skins.Current()->Theme()->Load(themes.FileName(themeIndex)); - strn0cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme)); + Utf8Strn0Cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme)); ModifiedApperance |= themeIndex != originalThemeIndex; } if (data.OSDLeft != Setup.OSDLeft || data.OSDTop != Setup.OSDTop || data.OSDWidth != Setup.OSDWidth || data.OSDHeight != Setup.OSDHeight) { @@ -2256,9 +2256,9 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key) if (data.UseSmallFont != Setup.UseSmallFont || data.AntiAlias != Setup.AntiAlias) ModifiedApperance = true; if (fontNames.Size()) { - strn0cpy(data.FontOsd, fontNames[fontOsdIndex], sizeof(data.FontOsd)); - strn0cpy(data.FontSml, fontNames[fontSmlIndex], sizeof(data.FontSml)); - strn0cpy(data.FontFix, fontNames[fontFixIndex], sizeof(data.FontFix)); + Utf8Strn0Cpy(data.FontOsd, fontNames[fontOsdIndex], sizeof(data.FontOsd)); + Utf8Strn0Cpy(data.FontSml, fontNames[fontSmlIndex], sizeof(data.FontSml)); + Utf8Strn0Cpy(data.FontFix, fontNames[fontFixIndex], sizeof(data.FontFix)); } if (strcmp(data.FontOsd, Setup.FontOsd) || data.FontOsdSize != Setup.FontOsdSize) { cFont::SetFont(fontOsd, data.FontOsd, data.FontOsdSize); |