Merge lp:~laney/indicator-datetime/valid-day-of-month into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 242
Merged at revision: 242
Proposed branch: lp:~laney/indicator-datetime/valid-day-of-month
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 12 lines (+1/-1)
1 file modified
src/service.c (+1/-1)
To merge this branch: bzr merge lp:~laney/indicator-datetime/valid-day-of-month
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sebastien Bacher Approve
Review via email: mp+181501@code.launchpad.net

Commit message

Use month '1' when constructing the 'begin' range to decide which appointments to display. glib started validating the arguments to g_date_time_new and it turns out that '0' isn't a valid day of the month.

Description of the change

Use month '1' when constructing the 'begin' range to decide which appointments to display.

glib started validating the arguments to g_date_time_new and it turns out that '0' isn't a valid day of the month. :-)

i-datetime-service crashes with new glib otherwise due to the function returning NULL and there being no checking for this.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

that makes sense ;-)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

ok, CI got updated to not run the buggy hook, let's retry

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.c'
2--- src/service.c 2013-07-26 18:26:03 +0000
3+++ src/service.c 2013-08-22 09:19:43 +0000
4@@ -584,7 +584,7 @@
5
6 calendar_date = get_calendar_date (self);
7 g_date_time_get_ymd (calendar_date, &y, &m, &d);
8- begin = g_date_time_new_local (y, m, 0,
9+ begin = g_date_time_new_local (y, m, 1,
10 0, 0, 0);
11 end = g_date_time_new_local (y, m, g_date_get_days_in_month(m,y),
12 23, 59, 0);

Subscribers

People subscribed via source and target branches