From 1cddfbd5e59cc1de55072c79bf44447620f1ebc0 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Tue, 15 Apr 2003 22:26:11 +0000 Subject: If we already have an evolution_dir, free the old one before setting it 2003-04-15 Hans Petter Jansson * gui/calendar-component.c (owner_set_cb): If we already have an evolution_dir, free the old one before setting it anew. * gui/e-day-view-time-item.c (e_day_view_time_item_draw): Unref the metrics. * gui/e-day-view.c (e_day_view_style_set): Unref the metrics. (e_day_view_recalc_cell_sizes): We don't need font metrics here. (e_day_view_reshape_long_event): Ditto. * gui/e-meeting-model.c (init): Don't dup the string passed to e_table_without_hide(). * gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set): Unref the metrics. (e_meeting_time_selector_recalc_date_form): Doesn't need metrics. * gui/e-week-view-main-item.c (e_week_view_main_item_draw_day): Unref the metrics. * gui/e-week-view.c (e_week_view_style_set): Unref metrics. (e_week_view_recalc_cell_sizes): Ditto. (e_week_view_reshape_event_span): Move Pango stuff to where it can't be leaked due to an early return. Unref metrics. * gui/weekday-picker.c (weekday_picker_style_set): Unref metrics. * gui/dialogs/meeting-page.c (meeting_page_finalize): Free default address. svn path=/trunk/; revision=20857 --- calendar/gui/e-day-view.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'calendar/gui/e-day-view.c') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index f403aeb6ca..90e8f28069 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1261,6 +1261,7 @@ e_day_view_style_set (GtkWidget *widget, gtk_widget_set_usize (day_view->time_canvas, times_width, -1); g_object_unref (layout); + pango_font_metrics_unref (font_metrics); } @@ -1327,7 +1328,6 @@ e_day_view_recalc_cell_sizes (EDayView *day_view) char buffer[128]; PangoFontDescription *font_desc; PangoContext *pango_context; - PangoFontMetrics *font_metrics; PangoLayout *layout; gint pango_width; @@ -1336,8 +1336,6 @@ e_day_view_recalc_cell_sizes (EDayView *day_view) /* Set up Pango prerequisites */ font_desc = gtk_widget_get_style (GTK_WIDGET (day_view))->font_desc; pango_context = gtk_widget_get_pango_context (GTK_WIDGET (day_view)); - font_metrics = pango_context_get_metrics (pango_context, font_desc, - pango_context_get_language (pango_context)); layout = pango_layout_new (pango_context); /* Calculate the column sizes, using floating point so that pixels @@ -5192,7 +5190,6 @@ e_day_view_reshape_long_event (EDayView *day_view, gboolean show_icons = TRUE, use_max_width = FALSE; PangoFontDescription *font_desc; PangoContext *pango_context; - PangoFontMetrics *font_metrics; PangoLayout *layout; event = &g_array_index (day_view->long_events, EDayViewEvent, @@ -5223,8 +5220,6 @@ e_day_view_reshape_long_event (EDayView *day_view, /* Set up Pango prerequisites */ font_desc = gtk_widget_get_style (GTK_WIDGET (day_view))->font_desc; pango_context = gtk_widget_get_pango_context (GTK_WIDGET (day_view)); - font_metrics = pango_context_get_metrics (pango_context, font_desc, - pango_context_get_language (pango_context)); layout = pango_layout_new (pango_context); if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE -- cgit v1.2.3