diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
| commit | 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 (patch) | |
| tree | 828acaa7b76aa12a490a3238b0ec4a7086b8be16 /plugins/itip-formatter | |
| parent | 076b7c45131482b87d18963d34d035435491ee8d (diff) | |
| download | gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.gz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.bz2 gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.lz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.xz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.zst gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.zip | |
Merge revisions 36737:36810 from trunk.
svn path=/branches/kill-bonobo/; revision=36811
Diffstat (limited to 'plugins/itip-formatter')
| -rw-r--r-- | plugins/itip-formatter/ChangeLog | 9 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-formatter.c | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index f408872cdc..966cc611e7 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,10 @@ +2008-11-06 Patrick Ohly <patrick.ohly@gmx.de> + + ** Fix for bug #541121 + + * itip-formatter.c: don't allow sending a response to meeting + invitation replies + 2008-10-20 Milan Crha <mcrha@redhat.com> ** Fix for bug #514989 @@ -18,7 +25,7 @@ * itip-formatter.c: (view_response_cb): Use the proper functions to traverse messages in a folder's summary. -2008-10-10 Patrick Ohly <pohly@ecld0pohly> +2008-10-10 Patrick Ohly <patrick.ohly@gmx.de> ** #541121: improved itip formatter: allow replying to forwarded and already imported invitations; honor RVSP flag in invitation diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index a2ceffb77b..ae7190174b 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -686,9 +686,12 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) /* * Only allow replies if backend doesn't do that automatically. + * Only enable it for forwarded invitiations (PUBLISH) or direct + * invitiations (REQUEST), but not replies (REPLY). * Replies only make sense for events with an organizer. */ if (!e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_SAVE_SCHEDULES) && + (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) && pitip->has_organizer) { rsvp_enabled = TRUE; } |