diff options
| author | JP Rosevear <jpr@ximian.com> | 2001-10-25 02:22:29 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2001-10-25 02:22:29 +0800 |
| commit | 5cd755bc7d1779f92bbce5abd3eed0eeb684fce0 (patch) | |
| tree | 1e19a4aa52310656d3c065ad698151e20f8d1dc2 /calendar/conduits | |
| parent | 31d99df0f42df0095dbfd3f3b29f0962b97cde4b (diff) | |
| download | gsoc2013-evolution-5cd755bc7d1779f92bbce5abd3eed0eeb684fce0.tar gsoc2013-evolution-5cd755bc7d1779f92bbce5abd3eed0eeb684fce0.tar.gz gsoc2013-evolution-5cd755bc7d1779f92bbce5abd3eed0eeb684fce0.tar.bz2 gsoc2013-evolution-5cd755bc7d1779f92bbce5abd3eed0eeb684fce0.tar.lz gsoc2013-evolution-5cd755bc7d1779f92bbce5abd3eed0eeb684fce0.tar.xz gsoc2013-evolution-5cd755bc7d1779f92bbce5abd3eed0eeb684fce0.tar.zst gsoc2013-evolution-5cd755bc7d1779f92bbce5abd3eed0eeb684fce0.zip | |
track the spacer vbox (e_meeting_time_selector_style_set): make sure the
2001-10-24 JP Rosevear <jpr@ximian.com>
* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):
track the spacer vbox
(e_meeting_time_selector_style_set): make sure the rows are the
correct size for the style
* gui/e-meeting-time-sel-item.c
(e_meeting_time_selector_item_paint_day_top): slight adjustments
to where the text is drawn
* gui/e-meeting-time-sel.h: new member
* gui/e-meeting-model.c (build_etable): ensure uniform row height
* conduits/todo/todo-conduit.c (comp_from_remote_record): mark
status as completed in appropriate places and don't overwrite
legitimate percentages and such
svn path=/trunk/; revision=13989
Diffstat (limited to 'calendar/conduits')
| -rw-r--r-- | calendar/conduits/todo/todo-conduit.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index ed039b10b7..930a5dfd96 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -359,7 +359,7 @@ local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoCondui { const char *uid; int *priority; - struct icaltimetype *completed; + icalproperty_status status; CalComponentText summary; GSList *d_list = NULL; CalComponentText *description; @@ -427,12 +427,12 @@ local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoCondui } cal_component_free_datetime (&due); - cal_component_get_completed (comp, &completed); - if (completed) { + cal_component_get_status (comp, &status); + if (status == ICAL_STATUS_COMPLETED) local->todo->complete = 1; - cal_component_free_icaltimetype (completed); - } - + else + local->todo->complete = 0; + cal_component_get_priority (comp, &priority); if (priority && *priority != 0) { if (*priority <= 3) @@ -545,6 +545,23 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, cal_component_set_completed (comp, &now); cal_component_set_percent (comp, &percent); + cal_component_set_status (comp, ICAL_STATUS_COMPLETED); + } else { + int *percent; + icalproperty_status status; + + cal_component_set_completed (comp, NULL); + + cal_component_get_percent (comp, &percent); + if (percent == NULL || *percent == 100) { + int p = 0; + cal_component_set_percent (comp, &p); + } + cal_component_free_percent (percent); + + cal_component_get_status (comp, &status); + if (status == ICAL_STATUS_COMPLETED) + cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION); } if (!is_empty_time (todo.due)) { |