From cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 16 May 2013 13:06:56 -0400
Subject: em-format cleanups.

---
 em-format/e-mail-formatter-attachment-bar.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'em-format/e-mail-formatter-attachment-bar.c')

diff --git a/em-format/e-mail-formatter-attachment-bar.c b/em-format/e-mail-formatter-attachment-bar.c
index f91500ed1d..61c1509cd1 100644
--- a/em-format/e-mail-formatter-attachment-bar.c
+++ b/em-format/e-mail-formatter-attachment-bar.c
@@ -64,17 +64,8 @@ emfe_attachment_bar_format (EMailFormatterExtension *extension,
 	camel_stream_write_string (stream, str, cancellable, NULL);
 
 	g_free (str);
-	return TRUE;
-}
 
-static void
-unset_bar_from_store_data (GObject *store,
-                           EAttachmentBar *bar)
-{
-	/*
-	if (E_IS_ATTACHMENT_STORE (store))
-		g_object_set_data (store, "attachment-bar", NULL);
-	*/
+	return TRUE;
 }
 
 static GtkWidget *
@@ -83,17 +74,15 @@ emfe_attachment_bar_get_widget (EMailFormatterExtension *extension,
                                 EMailPart *part,
                                 GHashTable *params)
 {
-	EMailPartAttachmentBar *empab;
+	EAttachmentStore *store;
 	GtkWidget *widget;
 
-	g_return_val_if_fail (E_MAIL_PART_IS (part, EMailPartAttachmentBar), NULL);
+	g_return_val_if_fail (E_IS_MAIL_PART_ATTACHMENT_BAR (part), NULL);
+
+	store = E_MAIL_PART_ATTACHMENT_BAR (part)->store;
 
-	empab = (EMailPartAttachmentBar *) part;
-	widget = e_attachment_bar_new (empab->store);
-	g_object_set_data (G_OBJECT (empab->store), "attachment-bar", widget);
-	g_object_weak_ref (
-		G_OBJECT (widget),
-		(GWeakNotify) unset_bar_from_store_data, empab->store);
+	widget = e_attachment_bar_new (store);
+	g_object_set_data (G_OBJECT (store), "attachment-bar", widget);
 
 	return widget;
 }
-- 
cgit