evolution r36926 - in trunk/calendar: . gui

[mcrha svn gnome org]

Author: mcrha
Date: Mon Dec 22 11:20:09 2008
New Revision: 36926
URL: http://svn.gnome.org/viewvc/evolution?rev=36926&view=rev

Log:
2008-12-22  Milan Crha  <mcrha redhat com>

	** Fix for bug #559604

	* gui/e-calendar-view.h: (e_calendar_view_get_attendees_status_info):
	* gui/e-calendar-view.c: (e_calendar_view_get_attendees_status_info),
	(e_calendar_view_get_tooltips):
	* gui/e-calendar-table.c: (query_tooltip_cb): Show additional status
	information for the meeting only when user is an organizer.



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

Modified: trunk/calendar/gui/e-calendar-table.c
==============================================================================
--- trunk/calendar/gui/e-calendar-table.c	(original)
+++ trunk/calendar/gui/e-calendar-table.c	Mon Dec 22 11:20:09 2008
@@ -432,7 +432,7 @@
 	e_cal_component_free_datetime (&dtstart);
 	e_cal_component_free_datetime (&dtdue);
 
-	tmp = e_calendar_view_get_attendees_status_info (new_comp);
+	tmp = e_calendar_view_get_attendees_status_info (new_comp, comp->client);
 	if (tmp) {
 		l = gtk_label_new (tmp);
 		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);

Modified: trunk/calendar/gui/e-calendar-view.c
==============================================================================
--- trunk/calendar/gui/e-calendar-view.c	(original)
+++ trunk/calendar/gui/e-calendar-view.c	Mon Dec 22 11:20:09 2008
@@ -2213,7 +2213,7 @@
  * Free returned pointer with g_free.
  **/
 char *
-e_calendar_view_get_attendees_status_info (ECalComponent *comp)
+e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client)
 {
 	struct _values {
 		icalparameter_partstat status;
@@ -2234,7 +2234,7 @@
 	char *res = NULL;
 	int i;
 
-	if (!comp || !e_cal_component_has_attendees (comp))
+	if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user (comp, client))
 		return NULL;
 
 	e_cal_component_get_attendee_list (comp, &attendees);
@@ -2430,7 +2430,7 @@
 	g_free (tmp2);
 	g_free (tmp1);
 
-	tmp = e_calendar_view_get_attendees_status_info (newcomp);
+	tmp = e_calendar_view_get_attendees_status_info (newcomp, pevent->comp_data->client);
 	if (tmp) {
 		hbox = gtk_hbox_new (FALSE, 0);
 		gtk_box_pack_start ((GtkBox *)hbox, gtk_label_new (tmp), FALSE, FALSE, 0);

Modified: trunk/calendar/gui/e-calendar-view.h
==============================================================================
--- trunk/calendar/gui/e-calendar-view.h	(original)
+++ trunk/calendar/gui/e-calendar-view.h	Mon Dec 22 11:20:09 2008
@@ -176,7 +176,7 @@
 void           e_calendar_view_move_tip (GtkWidget *widget, int x, int y);
 
 const gchar *e_calendar_view_get_icalcomponent_summary (ECal *ecal, icalcomponent *icalcomp, gboolean *free_text);
-char *e_calendar_view_get_attendees_status_info (ECalComponent *comp);
+char *e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client);
 
 void           draw_curved_rectangle (cairo_t *cr,
                                       double x0,