Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-dialog: calculate all_day before using it to set the dates

Browse Source 
It was using the all_day var before actually using it.

This caused an issue where the start time showed as the current time.
This commit is contained in:
Georges Basile Stavracas Neto
2015-01-13 16:18:40 -02:00
parent b1daf9eeb4
commit c799acf482
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-edit-dialog.c
+6 -4
View File
@@ -878,9 +878,14 @@ gcal_edit_dialog_set_event_data (GcalEditDialog *dialog,
gtk_header_bar_set_subtitle (GTK_HEADER_BAR (priv->titlebar), gtk_header_bar_set_subtitle (GTK_HEADER_BAR (priv->titlebar),
e_source_get_display_name (data->source)); e_source_get_display_name (data->source));
/* start date */ /* retrieve start and end dates */
e_cal_component_get_dtstart (priv->component, &dtstart); e_cal_component_get_dtstart (priv->component, &dtstart);
e_cal_component_get_dtend (priv->component, &dtend);
/* check if it's an all-day event */
all_day = (dtstart.value->is_date == 1 && (dtend.value != NULL ? dtend.value->is_date == 1 : FALSE));
/* start date */
gcal_date_selector_set_date (GCAL_DATE_SELECTOR (priv->start_date_selector), gcal_date_selector_set_date (GCAL_DATE_SELECTOR (priv->start_date_selector),
dtstart.value->day, dtstart.value->day,
dtstart.value->month, dtstart.value->month,
@@ -895,12 +900,10 @@ gcal_edit_dialog_set_event_data (GcalEditDialog *dialog,
gcal_time_selector_set_time (GCAL_TIME_SELECTOR (priv->start_time_selector), dtstart.value->hour, dtstart.value->minute); gcal_time_selector_set_time (GCAL_TIME_SELECTOR (priv->start_time_selector), dtstart.value->hour, dtstart.value->minute);
/* end date */ /* end date */
e_cal_component_get_dtend (priv->component, &dtend);
if (dtend.value != NULL) if (dtend.value != NULL)
{ {
gcal_date_selector_set_date (GCAL_DATE_SELECTOR (priv->end_date_selector), gcal_date_selector_set_date (GCAL_DATE_SELECTOR (priv->end_date_selector),
dtend.value->day, dtend.value->month, dtend.value->year); dtend.value->day, dtend.value->month, dtend.value->year);
all_day = (dtstart.value->is_date == 1 && dtend.value->is_date == 1);
if (!all_day) if (!all_day)
gcal_time_selector_set_time (GCAL_TIME_SELECTOR (priv->end_time_selector), dtend.value->hour, dtend.value->minute); gcal_time_selector_set_time (GCAL_TIME_SELECTOR (priv->end_time_selector), dtend.value->hour, dtend.value->minute);
@@ -910,7 +913,6 @@ gcal_edit_dialog_set_event_data (GcalEditDialog *dialog,
gcal_date_selector_set_date (GCAL_DATE_SELECTOR (priv->end_date_selector), gcal_date_selector_set_date (GCAL_DATE_SELECTOR (priv->end_date_selector),
dtstart.value->day, dtstart.value->month, dtstart.value->year); dtstart.value->day, dtstart.value->month, dtstart.value->year);
gcal_time_selector_set_time (GCAL_TIME_SELECTOR (priv->end_time_selector), dtstart.value->hour, dtstart.value->minute); gcal_time_selector_set_time (GCAL_TIME_SELECTOR (priv->end_time_selector), dtstart.value->hour, dtstart.value->minute);
all_day = FALSE;
} }
e_cal_component_free_datetime (&dtstart); e_cal_component_free_datetime (&dtstart);