From b2e7b2d36fa083b5702d1e2a8db62b32aa1b5699 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Sat, 26 Jun 2010 22:42:07 +0000
Subject: *** empty log message ***

---
 src/cairo/cdcairodbuf.c | 3 +--
 src/gdk/cdgdkdbuf.c     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/cairo/cdcairodbuf.c b/src/cairo/cdcairodbuf.c
index 1395e8c..4c5897a 100644
--- a/src/cairo/cdcairodbuf.c
+++ b/src/cairo/cdcairodbuf.c
@@ -129,8 +129,7 @@ static int cdactivate(cdCtxCanvas* ctxcanvas)
     if (canvas->stipple) canvas->cxStipple(ctxcanvas, canvas->stipple_w, canvas->stipple_h, canvas->stipple);
     if (canvas->pattern) canvas->cxPattern(ctxcanvas, canvas->pattern_w, canvas->pattern_h, canvas->pattern);
     canvas->cxInteriorStyle(ctxcanvas, canvas->interior_style);
-    if (canvas->native_font[0] == 0) canvas->cxFont(ctxcanvas, canvas->font_type_face, canvas->font_style, canvas->font_size);
-    else canvas->cxNativeFont(ctxcanvas, canvas->native_font);
+    canvas->cxFont(ctxcanvas, canvas->font_type_face, canvas->font_style, canvas->font_size);
 /*    canvas->cxTextAlignment(ctxcanvas, canvas->text_alignment);     */
 /*    canvas->cxTextOrientation(ctxcanvas, canvas->text_orientation); */
     if (canvas->clip_mode == CD_CLIPAREA && canvas->cxClipArea) canvas->cxClipArea(ctxcanvas, canvas->clip_rect.xmin, canvas->clip_rect.xmax, canvas->clip_rect.ymin, canvas->clip_rect.ymax);
diff --git a/src/gdk/cdgdkdbuf.c b/src/gdk/cdgdkdbuf.c
index b399cbe..9a8854a 100644
--- a/src/gdk/cdgdkdbuf.c
+++ b/src/gdk/cdgdkdbuf.c
@@ -121,8 +121,7 @@ static int cdactivate(cdCtxCanvas* ctxcanvas)
     if (canvas->stipple) canvas->cxStipple(ctxcanvas, canvas->stipple_w, canvas->stipple_h, canvas->stipple);
     if (canvas->pattern) canvas->cxPattern(ctxcanvas, canvas->pattern_w, canvas->pattern_h, canvas->pattern);
     canvas->cxInteriorStyle(ctxcanvas, canvas->interior_style);
-    if (canvas->native_font[0] == 0) canvas->cxFont(ctxcanvas, canvas->font_type_face, canvas->font_style, canvas->font_size);
-    else canvas->cxNativeFont(ctxcanvas, canvas->native_font);
+    canvas->cxFont(ctxcanvas, canvas->font_type_face, canvas->font_style, canvas->font_size);
 /*    canvas->cxTextAlignment(ctxcanvas, canvas->text_alignment);     */
 /*    canvas->cxTextOrientation(ctxcanvas, canvas->text_orientation); */
     if (canvas->clip_mode == CD_CLIPAREA && canvas->cxClipArea) canvas->cxClipArea(ctxcanvas, canvas->clip_rect.xmin, canvas->clip_rect.xmax, canvas->clip_rect.ymin, canvas->clip_rect.ymax);
-- 
cgit v1.2.3