6 files changed, 11 insertions, 0 deletions
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 159a6b4578..724d4683a8 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -67,6 +67,11 @@ calendar_prefs_dialog_finalize (GObject *obj)
 
 	g_object_unref (prefs->gui);
 
+	if (prefs->gconf) {
+		g_object_unref (prefs->gconf);
+		prefs->gconf = NULL;
+	}
+
 	((GObjectClass *)(parent_class))->finalize (obj);
 }
 
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 0999605e07..f263b18865 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -143,6 +143,7 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source,
 			sopts->completed = E_RETURN_NOTIFY_MAIL;
 	}
 
+	g_object_unref (gconf);
 }
 
 void 
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 91787bc12f..de1048c793 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -3175,6 +3175,7 @@ event_page_create_source_option_menu (void)
 
 	menu = e_source_option_menu_new (source_list);
 	g_object_unref (source_list);
+	g_object_unref (gconf_client);
 
 	gtk_widget_show (menu);
 	return menu;
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index b307da3ed8..6f2d1af20f 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -1179,6 +1179,7 @@ memo_page_create_source_option_menu (void)
 
 	menu = e_source_option_menu_new (source_list);
 	g_object_unref (source_list);
+	g_object_unref (gconf_client);
 
 	gtk_widget_show (menu);
 	return menu;
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 43a9b793eb..e839d3a810 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1969,6 +1969,7 @@ task_page_create_source_option_menu (void)
 
 	menu = e_source_option_menu_new (source_list);
 	g_object_unref (source_list);
+	g_object_unref (gconf_client);
 
 	gtk_widget_show (menu);
 	return menu;
diff --git a/calendar/gui/dialogs/url-editor-dialog.c b/calendar/gui/dialogs/url-editor-dialog.c
index e7759955fe..b9245d6a53 100644
--- a/calendar/gui/dialogs/url-editor-dialog.c
+++ b/calendar/gui/dialogs/url-editor-dialog.c
@@ -306,6 +306,8 @@ init_widgets (UrlDialogData *url_dlg_data)
 	}
 	
 	gtk_widget_show (url_dlg_data->scrolled_window);
+
+	g_object_unref (gconf_client);
 }
 
 static void