Indicator Location

Merge lp:~charlesk/indicator-location/dont-leak-serialized-icons into lp:indicator-location/14.04

  1. dont-leak-serialized-icons
  2. Merge into trunk.14.04
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 57
Merged at revision: 57
Proposed branch: lp:~charlesk/indicator-location/dont-leak-serialized-icons
Merge into: lp:indicator-location/14.04
Diff against target: 17 lines (+6/-1)
1 file modified
src/phone.cc (+6/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-location/dont-leak-serialized-icons
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+194554@code.launchpad.net

Description of the change

fix a minor memory leak that was caused by treating the variant returned by g_icon_serialize() as floating.

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

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-location-ci/27/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/phone.cc'
2--- src/phone.cc 2013-10-31 18:54:01 +0000
3+++ src/phone.cc 2013-11-08 17:29:53 +0000
4@@ -85,7 +85,12 @@
5
6 const char * icon_name = "gps";
7 GIcon * icon = g_themed_icon_new_with_default_fallbacks (icon_name);
8- g_variant_builder_add (&builder, "{sv}", "icon", g_icon_serialize (icon));
9+ GVariant * serialized_icon = g_icon_serialize (icon);
10+ if (serialized_icon != NULL)
11+ {
12+ g_variant_builder_add (&builder, "{sv}", "icon", serialized_icon);
13+ g_variant_unref (serialized_icon);
14+ }
15 g_object_unref (icon);
16
17 return g_variant_builder_end (&builder);

Subscribers

People subscribed via source and target branches