evolution r37124 - in trunk/calendar: . gui

[mcrha svn gnome org]

Author: mcrha
Date: Fri Jan 23 16:12:05 2009
New Revision: 37124
URL: http://svn.gnome.org/viewvc/evolution?rev=37124&view=rev

Log:
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.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/e-calendar-view.c
   trunk/calendar/gui/itip-utils.c
   trunk/calendar/gui/itip-utils.h

Modified: trunk/calendar/gui/e-calendar-view.c
==============================================================================
--- trunk/calendar/gui/e-calendar-view.c	(original)
+++ trunk/calendar/gui/e-calendar-view.c	Fri Jan 23 16:12:05 2009
@@ -2265,7 +2265,7 @@
 	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);

Modified: trunk/calendar/gui/itip-utils.c
==============================================================================
--- trunk/calendar/gui/itip-utils.c	(original)
+++ trunk/calendar/gui/itip-utils.c	Fri Jan 23 16:12:05 2009
@@ -83,13 +83,13 @@
 }
 
 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 @@
 }
 
 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;

Modified: trunk/calendar/gui/itip-utils.h
==============================================================================
--- trunk/calendar/gui/itip-utils.h	(original)
+++ trunk/calendar/gui/itip-utils.h	Fri Jan 23 16:12:05 2009
@@ -51,6 +51,7 @@
 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);