From d63e4b2d49d0ac988d08ea76da8d44a418626384 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Dapena=20Paz?= Date: Wed, 27 Jan 2010 09:57:41 +0100 Subject: [PATCH] API for reply calendar doesn't need now the msg, as the method internally can get the original msg. --- src/modest-plugin-ui-actions.h | 6 ++++-- src/modest-ui-actions.c | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modest-plugin-ui-actions.h b/src/modest-plugin-ui-actions.h index b53cc3e..1f8f457 100644 --- a/src/modest-plugin-ui-actions.h +++ b/src/modest-plugin-ui-actions.h @@ -68,14 +68,16 @@ modest_ui_actions_on_reload_message (const gchar *msg_id); /** * modest_ui_actions_reply_calendar: * @win: parent #ModestWindow - * @msg: original #TnyMsg * @header_pairs: #TnyList of #TnyPair of header pairs * * this method opens the mail composer with a reply of a message with calendar * allowing to add @header_pairs with the result of the calendar request. + * + * @win should be a #ModestMsgViewWindow. We don't put the exact type to avoid + * exporting to plugins #ModestMsgViewWindow API */ void -modest_ui_actions_reply_calendar (ModestWindow *win, TnyMsg *msg, TnyList *header_pairs); +modest_ui_actions_reply_calendar (ModestWindow *win, TnyList *header_pairs); G_END_DECLS diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index db9be88..8112d12 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -2030,7 +2030,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) } void -modest_ui_actions_reply_calendar (ModestWindow *win, TnyMsg *msg, TnyList *header_pairs) +modest_ui_actions_reply_calendar (ModestWindow *win, TnyList *header_pairs) { gchar *from; gchar *recipient; @@ -2043,6 +2043,7 @@ modest_ui_actions_reply_calendar (ModestWindow *win, TnyMsg *msg, TnyList *heade const gchar *mailbox; TnyHeader *msg_header; ModestWindowMgr *mgr; + TnyMsg *msg; g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW(win)); @@ -2061,6 +2062,9 @@ modest_ui_actions_reply_calendar (ModestWindow *win, TnyMsg *msg, TnyList *heade &use_signature); g_free (recipient); + msg = modest_msg_view_window_get_message(MODEST_MSG_VIEW_WINDOW(win)); + g_return_if_fail(msg); + msg_header = tny_msg_get_header (msg); new_msg = modest_tny_msg_create_reply_calendar_msg (msg, msg_header, from, -- 1.7.9.5