59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
|
Index: calendar/gui/itip-utils.c
|
||
|
|
===================================================================
|
||
|
|
--- calendar/gui/itip-utils.c (revision 37007)
|
||
|
|
+++ calendar/gui/itip-utils.c (working copy)
|
||
|
|
@@ -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 *c
|
||
|
|
}
|
||
|
|
|
||
|
|
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;
|
||
|
|
Index: calendar/gui/itip-utils.h
|
||
|
|
===================================================================
|
||
|
|
--- calendar/gui/itip-utils.h (revision 37007)
|
||
|
|
+++ calendar/gui/itip-utils.h (working copy)
|
||
|
|
@@ -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);
|
||
|
|
Index: calendar/gui/e-calendar-view.c
|
||
|
|
===================================================================
|
||
|
|
--- calendar/gui/e-calendar-view.c (revision 37007)
|
||
|
|
+++ calendar/gui/e-calendar-view.c (working copy)
|
||
|
|
@@ -2234,7 +2234,7 @@ e_calendar_view_get_attendees_status_inf
|
||
|
|
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);
|