From 1768e0e4fde11a6dfdf2336536edce3c954f4474 Mon Sep 17 00:00:00 2001 From: Lauris Kaplinski Date: Fri, 8 Sep 2000 22:32:24 +0000 Subject: Some UTF-8 fixes and experimental 16-bit unicode font support svn path=/trunk/; revision=5279 --- addressbook/gui/minicard/e-minicard-label.c | 6 ++---- addressbook/gui/minicard/e-minicard.c | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'addressbook/gui/minicard') diff --git a/addressbook/gui/minicard/e-minicard-label.c b/addressbook/gui/minicard/e-minicard-label.c index e765a89f21..c0f45f67c9 100644 --- a/addressbook/gui/minicard/e-minicard-label.c +++ b/addressbook/gui/minicard/e-minicard-label.c @@ -220,11 +220,9 @@ e_minicard_label_construct (GnomeCanvasItem *item) { EMinicardLabel *e_minicard_label; GnomeCanvasGroup *group; - static GdkFont *font = NULL; + GdkFont *font; - if (font == NULL) { - font = gdk_font_load("lucidasans-10"); - } + font = ((GtkWidget *) item->canvas)->style->font; e_minicard_label = E_MINICARD_LABEL (item); group = GNOME_CANVAS_GROUP( item ); diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c index e9bb85c89d..d870de7b25 100644 --- a/addressbook/gui/minicard/e-minicard.c +++ b/addressbook/gui/minicard/e-minicard.c @@ -285,7 +285,9 @@ e_minicard_realize (GnomeCanvasItem *item) "width", (double) ( e_minicard->width - 12 ), "clip", TRUE, "use_ellipsis", TRUE, - "font", "lucidasans-bold-10", +#if 0 + "font", "fixed-bold-10", +#endif "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL], "text", "", NULL ); @@ -626,11 +628,9 @@ get_left_width(EMinicard *e_minicard) gchar *name; ECardSimpleField field; gdouble width = -1; - static GdkFont *font = NULL; + GdkFont *font; - if (font == NULL) { - font = gdk_font_load("lucidasans-10"); - } + font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)->canvas)->style->font; for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) { gdouble this_width; -- cgit v1.2.3