sawfish r4216 - trunk/src

[jkozicki svn gnome org]

Author: jkozicki
Date: Sun Jan 20 16:51:02 2008
New Revision: 4216
URL: http://svn.gnome.org/viewvc/sawfish?rev=4216&view=rev

Log:
un-apply "Pango draw() ignores font" patch

see problems with it on http://mail.gnome.org/archives/sawfish-list/2008-January/msg00043.html

M    src/fonts.c



Modified:
   trunk/src/fonts.c

Modified: trunk/src/fonts.c
==============================================================================
--- trunk/src/fonts.c	(original)
+++ trunk/src/fonts.c	Sun Jan 20 16:51:02 2008
@@ -485,12 +485,6 @@
     PangoLayout *layout;
     PangoRectangle rect;
 
-    {
-	PangoFontDescription *desc = pango_font_describe(f->font);
-	pango_context_set_font_description(pango_context, desc);
-	pango_font_description_free(desc);
-    }
-
     layout = pango_layout_new (pango_context);
     pango_layout_set_text (layout, string, length);
 
@@ -546,12 +540,6 @@
     xft_color.color.blue = fg->blue;
     xft_color.color.alpha = fg->alpha;
 
-    {
-	PangoFontDescription *desc = pango_font_describe(f->font);
-	pango_context_set_font_description(pango_context, desc);
-	pango_font_description_free(desc);
-    }
-
     layout = pango_layout_new (pango_context);
     pango_layout_set_text (layout, string, length);
     iter = pango_layout_get_iter (layout);