Fix various memory leaks

6 files changed, 25 insertions, 1 deletions

diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index e0a9c48aaf..17bc6d4d6f 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -938,6 +938,7 @@ event_page_finalize (GObject *object)
 	g_ptr_array_free (priv->deleted_attendees, TRUE);
 
 	g_free (priv->old_summary);
+	g_free (priv->user_add);
 
 	priv->alarm_list_dlg_widget = NULL;
 
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 687e4968c1..77f8c72b1b 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -78,9 +78,22 @@ G_DEFINE_TYPE_WITH_CODE (
 		e_alarm_list_tree_model_init))
 
 static void
+alarm_list_finalize (GObject *object)
+{
+	e_alarm_list_clear (E_ALARM_LIST (object));
+
+	G_OBJECT_CLASS (e_alarm_list_parent_class)->finalize (object);
+}
+
+static void
 e_alarm_list_class_init (EAlarmListClass *class)
 {
+	GObjectClass *object_class;
+
 	column_types[E_ALARM_LIST_COLUMN_DESCRIPTION] = G_TYPE_STRING;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->finalize = alarm_list_finalize;
 }
 
 static void
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index aff77fa6e4..e70271937c 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1133,7 +1133,7 @@ cal_model_finalize (GObject *object)
 		}
 		g_object_unref (comp_data);
 	}
-	g_ptr_array_free (priv->objects, FALSE);
+	g_ptr_array_free (priv->objects, TRUE);
 
 	g_mutex_clear (&priv->notify_lock);
 
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 5ceca0be3c..1d13953dd7 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -134,6 +134,8 @@ cell_date_edit_text_get_text (ECellText *cell,
 
 static void
 cell_date_edit_text_free_text (ECellText *cell,
+			       ETableModel *model,
+			       gint col,
                                gchar *text)
 {
 	g_free (text);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 919f1141c2..658f6d60b7 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1146,6 +1146,12 @@ day_view_dispose (GObject *object)
 	g_clear_object (&day_view->time_canvas);
 	g_clear_object (&day_view->priv->model);
 
+	g_free (day_view->priv->marcus_bains_day_view_color);
+	day_view->priv->marcus_bains_day_view_color = NULL;
+
+	g_free (day_view->priv->marcus_bains_time_bar_color);
+	day_view->priv->marcus_bains_time_bar_color = NULL;
+
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (e_day_view_parent_class)->dispose (object);
 }
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index dfbf43d3ba..771742adf9 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -839,6 +839,8 @@ e_meeting_list_view_column_set_visible (EMeetingListView *view,
 			break;
 		}
 	}
+
+	g_list_free (cols);
 }
 
 void