From d88a9e736052357389f77a1e8e25221a1517ca72 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. --- calendar/gui/e-day-view-main-item.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 5f8ef0d61b..98ce4ff335 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -187,7 +187,6 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, gboolean draw_attach_icon; ECalComponentTransparency transparency; cairo_pattern_t *pat; - cairo_font_options_t *font_options; guint16 red, green, blue; gint i; gdouble radius, x0, y0, rect_height, rect_width, text_x_offset = 0.0; @@ -232,8 +231,6 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, gdk_cairo_set_source_color (cr, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]); - font_options = get_font_options (); - if (!is_array_index_in_bounds (day_view->events[day], event_num)) return; @@ -553,7 +550,6 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, cairo_set_source_rgb (cr, 0, 0, 0); else cairo_set_source_rgb (cr, 1, 1, 1); - cairo_set_font_options (cr, font_options); cairo_show_text (cr, end_regsizeime); cairo_close_path (cr); cairo_restore (cr); @@ -789,15 +785,11 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, else cairo_set_source_rgb (cr, 1, 1, 1); cairo_set_font_size (cr, 14.0); - cairo_set_font_options (cr, font_options); cairo_show_text (cr, text); cairo_close_path (cr); cairo_restore (cr); } - if (font_options) - cairo_font_options_destroy (font_options); - g_free (text); g_object_unref (comp); } -- cgit v1.2.3