diff options
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 2 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 10 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.h | 1 |
4 files changed, 20 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5d411ada43..6cf61f9f15 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,15 @@ 2009-01-23 Milan Crha <mcrha@redhat.com> + ** Fix for bug #559604 + + * gui/itip-utils.h: (itip_organizer_is_user_ex): + * gui/itip-utils.c: (itip_organizer_is_user_ex), + (itip_organizer_is_user): + * gui/e-calendar-view.c: (e_calendar_view_get_attendees_status_info): + Let the feature work with Groupwise too. + +2009-01-23 Milan Crha <mcrha@redhat.com> + ** Fix for bug #442869 * gui/dialogs/task-page.c: (attendee_added_cb): diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 98edbb7d3e..1215d5d7a2 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -2265,7 +2265,7 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client) char *res = NULL; int i; - if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user (comp, client)) + if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user_ex (comp, client, TRUE)) return NULL; e_cal_component_get_attendee_list (comp, &attendees); diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 5bd4452154..574c7800f1 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -83,13 +83,13 @@ itip_addresses_get_default (void) } gboolean -itip_organizer_is_user (ECalComponent *comp, ECal *client) +itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_test) { ECalComponentOrganizer organizer; const char *strip; gboolean user_org = FALSE; - if (!e_cal_component_has_organizer (comp) || e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER)) + if (!e_cal_component_has_organizer (comp) || (!skip_cap_test && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER))) return FALSE; e_cal_component_get_organizer (comp, &organizer); @@ -117,6 +117,12 @@ itip_organizer_is_user (ECalComponent *comp, ECal *client) } gboolean +itip_organizer_is_user (ECalComponent *comp, ECal *client) +{ + return itip_organizer_is_user_ex (comp, client, FALSE); +} + +gboolean itip_sentby_is_user (ECalComponent *comp) { ECalComponentOrganizer organizer; diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h index 3c84af929f..631c0a3430 100644 --- a/calendar/gui/itip-utils.h +++ b/calendar/gui/itip-utils.h @@ -51,6 +51,7 @@ EAccountList *itip_addresses_get (void); EAccount *itip_addresses_get_default (void); gboolean itip_organizer_is_user (ECalComponent *comp, ECal *client); +gboolean itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_test); gboolean itip_sentby_is_user (ECalComponent *comp); const gchar *itip_strip_mailto (const gchar *address); |