From f7633249cd82c0808fa5a563b48b900e49988db7 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 6 Mar 2007 08:32:11 +0000 Subject: [PATCH] * update for tinymail changes pmo-trunk-r888 --- src/modest-mail-operation.c | 5 ++--- src/modest-tny-msg.c | 4 +--- src/modest-tny-platform-factory.c | 9 --------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 2984cdd..c902b66 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -312,9 +313,7 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu g_object_unref (G_OBJECT(body)); /* Fill the header */ - new_header = TNY_HEADER (tny_platform_factory_new_header - (modest_runtime_get_platform_factory())); - tny_msg_set_header (new_msg, new_header); + new_header = tny_msg_get_header (new_msg); tny_header_set_from (new_header, from); tny_header_set_replyto (new_header, from); diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 71414f8..fac56d5 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -62,10 +62,8 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, /* Create new msg */ fact = modest_runtime_get_platform_factory (); new_msg = tny_platform_factory_new_msg (fact); - header = tny_platform_factory_new_header (fact); + header = tny_msg_get_header (new_msg); - /* WARNING: set the header before assign values to it */ - tny_msg_set_header (new_msg, header); tny_header_set_from (TNY_HEADER (header), from); tny_header_set_replyto (TNY_HEADER (header), from); tny_header_set_to (TNY_HEADER (header), mailto); diff --git a/src/modest-tny-platform-factory.c b/src/modest-tny-platform-factory.c index fe936e5..dad5e4b 100644 --- a/src/modest-tny-platform-factory.c +++ b/src/modest-tny-platform-factory.c @@ -53,8 +53,6 @@ static TnyDevice* modest_tny_platform_factory_new_device (TnyPlatfo static TnyMsgView* modest_tny_platform_factory_new_msg_view (TnyPlatformFactory *self); static TnyMsg* modest_tny_platform_factory_new_msg (TnyPlatformFactory *self); static TnyMimePart* modest_tny_platform_factory_new_mime_part (TnyPlatformFactory *self); -static TnyHeader* modest_tny_platform_factory_new_header (TnyPlatformFactory *self); - /* list my signals */ enum { @@ -162,8 +160,6 @@ tny_platform_factory_init (gpointer g, gpointer iface_data) klass->new_msg_view_func = modest_tny_platform_factory_new_msg_view; klass->new_msg_func = modest_tny_platform_factory_new_msg; klass->new_mime_part_func = modest_tny_platform_factory_new_mime_part; - klass->new_header_func = modest_tny_platform_factory_new_header; - return; } @@ -210,8 +206,3 @@ modest_tny_platform_factory_new_mime_part (TnyPlatformFactory *self) } -static TnyHeader* -modest_tny_platform_factory_new_header (TnyPlatformFactory *self) -{ - return tny_camel_header_new (); -} -- 1.7.9.5