diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-07 09:27:31 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:12 +0800 |
| commit | 3b205698762afcd86ac79595960253d84aff5487 (patch) | |
| tree | f0f1ae05b5bd7fbd0008dbd8dbdd10908ebc1c6c /e-util/ea-calendar-item.c | |
| parent | 5a7097278a6f6eb2a984d9e0c742342135971c35 (diff) | |
| download | gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.gz gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.bz2 gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.lz gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.xz gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.zst gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.zip | |
Convert all "week-start-day" properties to GDateWeekday.
Diffstat (limited to 'e-util/ea-calendar-item.c')
| -rw-r--r-- | e-util/ea-calendar-item.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/e-util/ea-calendar-item.c b/e-util/ea-calendar-item.c index 2f5ac91d5b..aefcbbaa12 100644 --- a/e-util/ea-calendar-item.c +++ b/e-util/ea-calendar-item.c @@ -1334,8 +1334,8 @@ e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem, gint year, gint month) { + GDateWeekday weekday; struct tm tmp_tm; - gint start_weekday, days_from_week_start; memset (&tmp_tm, 0, sizeof (tmp_tm)); tmp_tm.tm_year = year - 1900; @@ -1343,10 +1343,10 @@ e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem, tmp_tm.tm_mday = 1; tmp_tm.tm_isdst = -1; mktime (&tmp_tm); - start_weekday = (tmp_tm.tm_wday + 6) % 7; /* 0 to 6 */ - days_from_week_start = (start_weekday + 7 - calitem->week_start_day) - % 7; - return days_from_week_start; + + weekday = e_weekday_from_tm_wday (tmp_tm.tm_wday); + + return e_weekday_get_days_between (calitem->week_start_day, weekday); } static void |