pango r2732 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Thu Oct 23 18:24:48 2008
New Revision: 2732
URL: http://svn.gnome.org/viewvc/pango?rev=2732&view=rev

Log:
2008-10-23  Behdad Esfahbod  <behdad gnome org>

        Bug 557620 â pango_font_description_from_string not correct

        * pango/fonts.c (find_field_any): Fix parsing of "normal" when
        not at the end of string.

Modified:
   trunk/ChangeLog
   trunk/pango/fonts.c

Modified: trunk/pango/fonts.c
==============================================================================
--- trunk/pango/fonts.c	(original)
+++ trunk/pango/fonts.c	Thu Oct 23 18:24:48 2008
@@ -933,9 +933,7 @@
 static gboolean
 find_field_any (const char *str, int len, PangoFontDescription *desc)
 {
-  gboolean found = FALSE;
-
-  if (g_ascii_strcasecmp (str, "Normal") == 0)
+  if (field_matches ("Normal", str, len))
     return TRUE;
 
 #define FIELD(NAME, MASK) \
@@ -943,9 +941,9 @@
   if (find_field (NAME##_map, G_N_ELEMENTS (NAME##_map), str, len, \
 		  desc ? (int *)&desc->NAME : NULL)) \
     { \
-      found = TRUE; \
       if (desc) \
 	desc->mask |= MASK; \
+      return TRUE; \
     } \
   } G_STMT_END
 
@@ -957,7 +955,7 @@
 
 #undef FIELD
 
-  return found;
+  return FALSE;
 }
 
 static const char *