[maemo-commits] [maemo-commits] r17577 - in projects/haf/trunk/clutter: clutter/pango debian

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-03-02 20:04:15 +0200 (Mon, 02 Mar 2009)
New Revision: 17577

Modified:
   projects/haf/trunk/clutter/clutter/pango/pangoclutter-render.c
   projects/haf/trunk/clutter/debian/changelog
Log:
ClutterLabel/pango crash fix when fonts are not installed.


Modified: projects/haf/trunk/clutter/clutter/pango/pangoclutter-render.c
===================================================================
--- projects/haf/trunk/clutter/clutter/pango/pangoclutter-render.c	2009-03-02 15:14:06 UTC (rev 17576)
+++ projects/haf/trunk/clutter/clutter/pango/pangoclutter-render.c	2009-03-02 18:04:15 UTC (rev 17577)
@@ -314,6 +314,9 @@
             {
               PangoGlyphInfo *gi = &glyphs->glyphs[i];
  
+              if (!run->item->analysis.font)
+                /* Font not found */
+                continue;
 	      pango_clutter_renderer_get_cached_glyph (renderer,
 						       run->item->analysis.font,
 						       gi->glyph);

Modified: projects/haf/trunk/clutter/debian/changelog
===================================================================
--- projects/haf/trunk/clutter/debian/changelog	2009-03-02 15:14:06 UTC (rev 17576)
+++ projects/haf/trunk/clutter/debian/changelog	2009-03-02 18:04:15 UTC (rev 17577)
@@ -6,6 +6,7 @@
     CLUTTER_DEBUG=backend
   * Refactored PVR texture compression code into GL-related and
     non-GL related code
+  * Don't crash if fonts are not installed.
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon,  2 Mar 2009 09:37:27 +0200