Indicator Date and Time

Merge lp:~charlesk/indicator-datetime/lp-1246532 into lp:indicator-datetime/14.04

  1. lp-1246532
  2. Merge into trunk.14.04
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 282
Merged at revision: 284
Proposed branch: lp:~charlesk/indicator-datetime/lp-1246532
Merge into: lp:indicator-datetime/14.04
Diff against target: 17 lines (+5/-2)
1 file modified
src/timezone.c (+5/-2)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/lp-1246532
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+193360@code.launchpad.net

Description of the change

Don't generate g_critical() messages in the log when the timezone object is clearing its value.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:282
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/18/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-datetime-ci/138/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/timezone.c'
2--- src/timezone.c 2013-09-09 17:56:22 +0000
3+++ src/timezone.c 2013-10-31 00:30:02 +0000
4@@ -124,8 +124,11 @@
5
6 if (g_strcmp0 (p->timezone->str, timezone))
7 {
8- g_string_assign (p->timezone, timezone);
9- g_debug ("%s new timezone set: '%s'", G_STRLOC, timezone);
10+ if (timezone != NULL)
11+ g_string_assign (p->timezone, timezone);
12+ else
13+ g_string_set_size (p->timezone, 0);
14+ g_debug ("%s new timezone set: '%s'", G_STRLOC, p->timezone->str);
15 g_object_notify_by_pspec (G_OBJECT(self), properties[PROP_TIMEZONE]);
16 }
17 }

Subscribers

People subscribed via source and target branches