dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed UTF-8 check. 

2003-07-30  Michael Natterer  <mitch@gimp.org>

	* tools/pdbgen/app.pl: fixed UTF-8 check.

	* app/pdb/text_tool_cmds.c: regenerated.
This commit is contained in:
Michael Natterer 2003-07-30 09:33:06 +00:00 committed by Michael Natterer
parent 0756a06d46
commit f23762ce56
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-30 Michael Natterer <mitch@gimp.org>
* tools/pdbgen/app.pl: fixed UTF-8 check.
* app/pdb/text_tool_cmds.c: regenerated.
2003-07-30 Dave Neary <bolsh@gimp.org>
plug-ins/common/edge.c: Trivial clean-up.

8
app/pdb/text_tool_cmds.c
View File

@ -81,7 +81,7 @@ text_fontname_invoker (Gimp *gimp,
y = args[3].value.pdb_float;
text = (gchar *) args[4].value.pdb_pointer;
if (text == NULL && !g_utf8_validate (text, -1, NULL))
if (text == NULL || !g_utf8_validate (text, -1, NULL))
success = FALSE;
border = args[5].value.pdb_int;
@ -218,7 +218,7 @@ text_get_extents_fontname_invoker (Gimp *gimp,
gchar *real_fontname;
text = (gchar *) args[0].value.pdb_pointer;
if (text == NULL && !g_utf8_validate (text, -1, NULL))
if (text == NULL || !g_utf8_validate (text, -1, NULL))
success = FALSE;
size = args[1].value.pdb_float;
@ -358,7 +358,7 @@ text_invoker (Gimp *gimp,
y = args[3].value.pdb_float;
text = (gchar *) args[4].value.pdb_pointer;
if (text == NULL && !g_utf8_validate (text, -1, NULL))
if (text == NULL || !g_utf8_validate (text, -1, NULL))
success = FALSE;
border = args[5].value.pdb_int;
@ -566,7 +566,7 @@ text_get_extents_invoker (Gimp *gimp,
gchar *real_fontname;
text = (gchar *) args[0].value.pdb_pointer;
if (text == NULL && !g_utf8_validate (text, -1, NULL))
if (text == NULL || !g_utf8_validate (text, -1, NULL))
success = FALSE;
size = args[1].value.pdb_float;

2
tools/pdbgen/app.pl
View File

@ -259,7 +259,7 @@ sub marshal_inargs {
if ($_->{utf8}) {
$reverse = sub { ${$_[0]} =~ s/!//;
${$_[0]} =~ s/==/!=/ };
$test = "$var == NULL && " .
$test = "$var == NULL || " .
"!g_utf8_validate ($var, -1, NULL)"
}
else {