If we already have an evolution_dir, free the old one before setting it

2003-04-15  Hans Petter Jansson  <hpj@ximian.com>

	* 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

1 files changed, 1 insertions, 3 deletions

diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index e902d01f61..0b44e16350 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -958,6 +958,7 @@ e_meeting_time_selector_style_set (GtkWidget *widget,
 	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
 
 	g_object_unref (layout);
+	pango_font_metrics_unref (font_metrics);
 }
 
 /* This draws a shadow around the top display and main display. */
@@ -2059,14 +2060,11 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts)
 	gchar buffer[128];
 	PangoFontDescription *font_desc;
 	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
 	PangoLayout *layout;
 
 	/* Set up Pango prerequisites */
 	font_desc = gtk_widget_get_style (GTK_WIDGET (mts))->font_desc;
 	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (mts));
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
 	layout = pango_layout_new (pango_context);
 
 	/* Calculate the maximum date width we can fit into the display. */