diff options
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-table.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 6 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.h | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 8e059dad45..b19b257e23 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +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. + 2008-12-17 Milan Crha <mcrha@redhat.com> * gui/e-cal-model.c: (update_e_cal_view_for_client): diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 899a8d9a4c..24e3675b19 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -432,7 +432,7 @@ query_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, Gtk 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); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index aee65cae19..0dc5a7eab3 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -2213,7 +2213,7 @@ e_calendar_view_move_tip (GtkWidget *widget, int x, int y) * 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 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp) 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 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data) 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); diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index ef74cdcfdb..63e3c149fd 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -176,7 +176,7 @@ gboolean e_calendar_view_get_tooltips (ECalendarViewEventData *data); 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, |