diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-table.c | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 64cf4f35a2..4a5161f63b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,10 @@ 2004-01-14 Rodrigo Moya <rodrigo@ximian.com> + * gui/e-calendar-table.c (e_calendar_table_show_popup_menu): + use get_selected_objects() instead of get_selected_comp(). + +2004-01-14 Rodrigo Moya <rodrigo@ximian.com> + * gui/e-cal-model-tasks.c (get_status): removed assertion. 2004-01-14 Rodrigo Moya <rodrigo@ximian.com> diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 4226628b35..786f97504a 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -1098,21 +1098,20 @@ e_calendar_table_show_popup_menu (ETable *table, int disable_mask = 0; GtkMenu *gtk_menu; icalproperty *prop; + GSList *selection; ECalModelComponent *comp_data; gboolean read_only = TRUE; - - n_selected = e_table_selected_count (table); - if (n_selected <= 0) - return TRUE; - comp_data = get_selected_comp (cal_table); - g_assert (comp_data != NULL); + selection = get_selected_objects (cal_table); + if (!selection) + return TRUE; + comp_data = selection->data; + n_selected = g_slist_length (selection); if (n_selected == 1) { hide_mask = MASK_MULTIPLE; /* See if the task has the URL property set */ - prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY); if (!prop) disable_mask |= MASK_LACKS_URL; @@ -1132,6 +1131,8 @@ e_calendar_table_show_popup_menu (ETable *table, e_popup_menu (gtk_menu, gdk_event); + g_slist_free (selection); + return TRUE; } |