diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
| commit | faf1c14c11f3e6026f786e9587715c10b13c723e (patch) | |
| tree | 3dbf5816532cbea2510b4438c7c40d91fc426d3a /calendar/modules/e-cal-shell-view-private.c | |
| parent | 86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff) | |
| download | gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.bz2 gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.lz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.xz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip | |
Manual conflict resolution
Diffstat (limited to 'calendar/modules/e-cal-shell-view-private.c')
| -rw-r--r-- | calendar/modules/e-cal-shell-view-private.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/calendar/modules/e-cal-shell-view-private.c b/calendar/modules/e-cal-shell-view-private.c index def3ba07e4..6022b712c2 100644 --- a/calendar/modules/e-cal-shell-view-private.c +++ b/calendar/modules/e-cal-shell-view-private.c @@ -439,7 +439,7 @@ e_cal_shell_view_open_event (ECalShellView *cal_shell_view, if (itip_organizer_is_user (comp, comp_data->client)) flags |= COMP_EDITOR_USER_ORG; - if (itip_sentby_is_user (comp)) + if (itip_sentby_is_user (comp, comp_data->client)) flags |= COMP_EDITOR_USER_ORG; if (!e_cal_component_has_attendees (comp)) |