From 76ca1494485a0919c8ed02db636bd3f1bc647e39 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 May 2011 13:08:04 -0400 Subject: Bug 649990 - Remove get_font_options() from e-util.c. Not only is get_font_options() no longer needed, it's actually doing the wrong thing by reading settings through GConfClient instead of GSettings. But it turns out, thanks to the tighter Cairo integration in GTK3, the widgets that call get_font_options() can be made to work correctly by simply removing this hack. Love it when that happens. --- widgets/table/e-cell-text.c | 9 --------- widgets/text/e-text.c | 9 --------- 2 files changed, 18 deletions(-) (limited to 'widgets') diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 1683e896f0..e3d095cc34 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -499,8 +499,6 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width) ECellText *ect = E_CELL_TEXT (ecell_view->ecell); PangoAttrList *attrs; PangoLayout *layout; - PangoContext *context; - cairo_font_options_t *font_options; layout = gtk_widget_create_pango_layout (GTK_WIDGET (((GnomeCanvasItem *) ecell_view->e_table_item_view)->canvas), text); @@ -512,13 +510,6 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width) if (text_view->edit || width <= 0) return layout; - context = pango_layout_get_context (layout); - - font_options = get_font_options (); - pango_cairo_context_set_font_options (context, font_options); - cairo_font_options_destroy (font_options); - pango_layout_context_changed (layout); - if (ect->font_name) { PangoFontDescription *desc = NULL, *fixed_desc = NULL; diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 40aedfc735..3986033c75 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -416,8 +416,6 @@ static void reset_layout (EText *text) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (text); - cairo_font_options_t *font_options; - PangoContext *context; if (text->layout == NULL) { create_layout (text); @@ -427,13 +425,6 @@ reset_layout (EText *text) style = gtk_widget_get_style (GTK_WIDGET (item->canvas)); - context = pango_layout_get_context (text->layout); - - font_options = get_font_options (); - pango_cairo_context_set_font_options (context, font_options); - cairo_font_options_destroy (font_options); - pango_layout_context_changed (text->layout); - if (text->font_desc) { pango_font_description_free (text->font_desc); } -- cgit v1.2.3