aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-08-14 08:49:46 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-08-14 08:56:33 +0800
commit6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f (patch)
tree8ac6832a905017845b3095112b83bb14da112617 /calendar
parentcaed9460b2d518005abe34035d5b414ff07c0212 (diff)
downloadgsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.gz
gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.zst
gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.zip
Pass an EShell to EMsgComposer instances.
Reduce the composer's dependency on e_shell_get_default().
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/itip-utils.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index d40a7ac633..28d95ac767 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -1273,6 +1273,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users,
gboolean strip_alarms, gboolean only_new_attendees)
{
+ EShell *shell;
EMsgComposer *composer;
EComposerHeaderTable *table;
EDestination **destinations;
@@ -1321,7 +1322,10 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
/* Subject information */
subject = comp_subject (method, comp);
- composer = e_msg_composer_new ();
+ /* FIXME Pass this in. */
+ shell = e_shell_get_default ();
+
+ composer = e_msg_composer_new (shell);
table = e_msg_composer_get_header_table (composer);
setup_from (method, send_comp, client, table);
@@ -1402,6 +1406,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
icalcomponent *zones,
GSList *attachments_list)
{
+ EShell *shell;
EMsgComposer *composer;
EComposerHeaderTable *table;
EDestination **destinations;
@@ -1423,7 +1428,10 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
/* Subject information */
subject = comp_subject (method, comp);
- composer = e_msg_composer_new ();
+ /* FIXME Pass this in. */
+ shell = e_shell_get_default ();
+
+ composer = e_msg_composer_new (shell);
table = e_msg_composer_get_header_table (composer);
setup_from (method, send_comp, client, table);