nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-05-28 15:24:49 -05:00
Code Issues Projects Releases Wiki Activity

Patch from Colin Watson to use g_ascii_strcasecmp in place of the

Browse Source 
deprecated g_strcasecmp (since all the strings being compared are
parts of XLFDs and won't be in interesting character sets anyway).

[originally from svn r9376]
This commit is contained in:
Simon Tatham 2012-01-03 19:43:19 +00:00
parent a80ba74239
commit 736c5f86eb
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
unix/gtkfont.c
View File

@ -41,6 +41,11 @@
* I haven't the energy. * I haven't the energy.
*/ */
#if !GLIB_CHECK_VERSION(1,3,7)
#define g_ascii_strcasecmp g_strcasecmp
#define g_ascii_strncasecmp g_strncasecmp
#endif
/* /*
* Ad-hoc vtable mechanism to allow font structures to be * Ad-hoc vtable mechanism to allow font structures to be
* polymorphic. * polymorphic.
@ -661,21 +666,21 @@ static void x11font_enum_fonts(GtkWidget *widget,
style = p; style = p;
p += sprintf(p, "%s", components[2][0] ? components[2] : p += sprintf(p, "%s", components[2][0] ? components[2] :
"regular"); "regular");
if (!g_strcasecmp(components[3], "i")) if (!g_ascii_strcasecmp(components[3], "i"))
p += sprintf(p, " italic"); p += sprintf(p, " italic");
else if (!g_strcasecmp(components[3], "o")) else if (!g_ascii_strcasecmp(components[3], "o"))
p += sprintf(p, " oblique"); p += sprintf(p, " oblique");
else if (!g_strcasecmp(components[3], "ri")) else if (!g_ascii_strcasecmp(components[3], "ri"))
p += sprintf(p, " reverse italic"); p += sprintf(p, " reverse italic");
else if (!g_strcasecmp(components[3], "ro")) else if (!g_ascii_strcasecmp(components[3], "ro"))
p += sprintf(p, " reverse oblique"); p += sprintf(p, " reverse oblique");
else if (!g_strcasecmp(components[3], "ot")) else if (!g_ascii_strcasecmp(components[3], "ot"))
p += sprintf(p, " other-slant"); p += sprintf(p, " other-slant");
if (components[4][0] && g_strcasecmp(components[4], "normal")) if (components[4][0] && g_ascii_strcasecmp(components[4], "normal"))
p += sprintf(p, " %s", components[4]); p += sprintf(p, " %s", components[4]);
if (!g_strcasecmp(components[10], "m")) if (!g_ascii_strcasecmp(components[10], "m"))
p += sprintf(p, " [M]"); p += sprintf(p, " [M]");
if (!g_strcasecmp(components[10], "c")) if (!g_ascii_strcasecmp(components[10], "c"))
p += sprintf(p, " [C]"); p += sprintf(p, " [C]");
if (components[5][0]) if (components[5][0])
p += sprintf(p, " %s", components[5]); p += sprintf(p, " %s", components[5]);
@ -687,23 +692,23 @@ static void x11font_enum_fonts(GtkWidget *widget,
*/ */
p++; p++;
stylekey = p; stylekey = p;
if (!g_strcasecmp(components[2], "medium") || if (!g_ascii_strcasecmp(components[2], "medium") ||
!g_strcasecmp(components[2], "regular") || !g_ascii_strcasecmp(components[2], "regular") ||
!g_strcasecmp(components[2], "normal") || !g_ascii_strcasecmp(components[2], "normal") ||
!g_strcasecmp(components[2], "book")) !g_ascii_strcasecmp(components[2], "book"))
weightkey = 0; weightkey = 0;
else if (!g_strncasecmp(components[2], "demi", 4) || else if (!g_ascii_strncasecmp(components[2], "demi", 4) ||
!g_strncasecmp(components[2], "semi", 4)) !g_ascii_strncasecmp(components[2], "semi", 4))
weightkey = 1; weightkey = 1;
else else
weightkey = 2; weightkey = 2;
if (!g_strcasecmp(components[3], "r")) if (!g_ascii_strcasecmp(components[3], "r"))
slantkey = 0; slantkey = 0;
else if (!g_strncasecmp(components[3], "r", 1)) else if (!g_ascii_strncasecmp(components[3], "r", 1))
slantkey = 2; slantkey = 2;
else else
slantkey = 1; slantkey = 1;
if (!g_strcasecmp(components[4], "normal")) if (!g_ascii_strcasecmp(components[4], "normal"))
setwidthkey = 0; setwidthkey = 0;
else else
setwidthkey = 1; setwidthkey = 1;
@ -915,8 +920,8 @@ static int pangofont_check_desc_makes_sense(PangoContext *ctx,
matched = FALSE; matched = FALSE;
for (i = 0; i < nfamilies; i++) { for (i = 0; i < nfamilies; i++) {
if (!g_strcasecmp(pango_font_family_get_name(families[i]), if (!g_ascii_strcasecmp(pango_font_family_get_name(families[i]),
pango_font_description_get_family(desc))) { pango_font_description_get_family(desc))) {
matched = TRUE; matched = TRUE;
break; break;
} }
@ -1713,7 +1718,7 @@ static int strnullcasecmp(const char *a, const char *b)
/* /*
* Otherwise, ordinary strcasecmp. * Otherwise, ordinary strcasecmp.
*/ */
return g_strcasecmp(a, b); return g_ascii_strcasecmp(a, b);
} }
static int fontinfo_realname_compare(void *av, void *bv) static int fontinfo_realname_compare(void *av, void *bv)