Remove PANGO_IS_FONT() check. Just do NULL-checking.

2007-01-24  Behdad Esfahbod  <behdad@gnome.org>

        * pango/fonts.c (pango_font_get_metrics),
        (pango_font_get_font_map): Remove PANGO_IS_FONT() check. Just
        do NULL-checking.

svn path=/trunk/; revision=2184

diff --git a/ChangeLog b/ChangeLog
index 15e2c6c..2b2930e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-24  Behdad Esfahbod  <behdad@gnome.org>
+
+       * pango/fonts.c (pango_font_get_metrics),
+       (pango_font_get_font_map): Remove PANGO_IS_FONT() check. Just
+       do NULL-checking.
+
 2007-01-23  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 399738 – pango 1.15.5 won't compile on Mac OS X: 'FC_HINT_STYLE'

diff --git a/pango/fonts.c b/pango/fonts.c
index 2bf5d70..be80094 100644 (file)
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -29,7 +29,7 @@
 #include "pango-fontmap.h"
 #include "pango-impl-utils.h"
 
-static const char bad_font_warning[] = "%s called with bad font, expect ugly output";
+static const char bad_font_warning[] = "%s called with null font argument, expect ugly output";
 
 struct _PangoFontDescription
 {
@@ -1336,7 +1336,7 @@ PangoFontMetrics *
 pango_font_get_metrics (PangoFont        *font,
                        PangoLanguage    *language)
 {
-  if (G_UNLIKELY (!PANGO_IS_FONT (font)))
+  if (G_UNLIKELY (!font))
     {
       PangoFontMetrics *metrics;
 
@@ -1375,7 +1375,7 @@ pango_font_get_metrics (PangoFont        *font,
 PangoFontMap *
 pango_font_get_font_map (PangoFont *font)
 {
-  if (G_UNLIKELY (!PANGO_IS_FONT (font)))
+  if (G_UNLIKELY (!font))
     {
 
       if (!_pango_warning_history.get_font_map)