gucharmap r1756 - trunk/gucharmap

[chpe svn gnome org]

Author: chpe
Date: Mon Mar 31 12:43:39 2008
New Revision: 1756
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1756&view=rev

Log:
Use gucharmap_chartable_set_font_desc_internal when creating the font_desc on style-set. Fixes incorrect layout in this case.


Modified:
   trunk/gucharmap/gucharmap-chartable.c

Modified: trunk/gucharmap/gucharmap-chartable.c
==============================================================================
--- trunk/gucharmap/gucharmap-chartable.c	(original)
+++ trunk/gucharmap/gucharmap-chartable.c	Mon Mar 31 12:43:39 2008
@@ -1648,9 +1648,12 @@
     g_object_unref (priv->pango_layout);
   priv->pango_layout = NULL;
 
-  if (priv->font_desc == NULL)
-    gucharmap_chartable_set_font_desc (chartable,
-                                       pango_font_description_copy (widget->style->font_desc));
+  if (priv->font_desc == NULL) {
+    PangoFontDescription *font_desc;
+
+    font_desc = pango_font_description_copy (widget->style->font_desc);
+    gucharmap_chartable_set_font_desc_internal (chartable, font_desc);
+  }
 
   priv->pango_layout = gtk_widget_create_pango_layout (widget, NULL);
   pango_layout_set_font_description (priv->pango_layout,
@@ -2010,7 +2013,9 @@
     case PROP_ZOOM_ENABLED:
       gucharmap_chartable_set_zoom_enabled (chartable, g_value_get_boolean (value));
       break;
-    case PROP_ZOOM_SHOWING: /* not writable */
+    case PROP_ZOOM_SHOWING:
+      /* not writable */
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;