From 436a31953e7492e6f41b948a1eae8d1ab6f20179 Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil@redhat.com>
Date: Wed, 1 Aug 2012 21:51:09 +0200
Subject: Fix some memory leaks

---
 modules/prefer-plain/e-mail-display-popup-prefer-plain.c | 16 ++++++++++++++++
 widgets/misc/e-web-view.c                                |  1 +
 2 files changed, 17 insertions(+)

diff --git a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
index fa87357eb9..55ee45527b 100644
--- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
@@ -350,15 +350,31 @@ e_mail_display_popup_prefer_plain_type_register (GTypeModule *type_module)
 	e_mail_display_popup_prefer_plain_register_type (type_module);
 }
 
+static void
+e_mail_display_popup_prefer_plain_finalize (GObject *object)
+{
+	EMailDisplayPopupPreferPlain *extension;
+
+	extension = E_MAIL_DISPLAY_POPUP_PREFER_PLAIN (object);
+
+	g_free (extension->text_html_id);
+	g_free (extension->text_plain_id);
+	g_object_unref (extension->action_group);
+}
+
 static void
 e_mail_display_popup_prefer_plain_class_init (EMailDisplayPopupPreferPlainClass *klass)
 {
 	EExtensionClass *extension_class;
+	GObjectClass *object_class;
 
 	e_mail_display_popup_prefer_plain_parent_class = g_type_class_peek_parent (klass);
 
 	extension_class = E_EXTENSION_CLASS (klass);
 	extension_class->extensible_type = E_TYPE_MAIL_DISPLAY;
+
+	object_class = G_OBJECT_CLASS (klass);
+	object_class->finalize = e_mail_display_popup_prefer_plain_finalize;
 }
 
 static void
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 0908449c6c..e24621e711 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -936,6 +936,7 @@ web_view_button_press_event (GtkWidget *widget,
 				g_object_unref (loader);
 				break;
 			}
+			g_list_free (subresources);
 		}
 
 		g_object_unref (test);
-- 
cgit