Merge lp://staging/~charlesk/indicator-power/accessiblename into lp://staging/indicator-power/1.0

Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 137
Merged at revision: 137
Proposed branch: lp://staging/~charlesk/indicator-power/accessiblename
Merge into: lp://staging/indicator-power/1.0
Diff against target: 85 lines (+14/-9)
1 file modified
src/indicator-power.c (+14/-9)
To merge this branch: bzr merge lp://staging/~charlesk/indicator-power/accessiblename
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+101278@code.staging.launchpad.net

Description of the change

Fixed bug #953176 by manually setting the menuitem's AtkObject's accessible_name project if possible.

Also fixes three related memory leaks:

 * When building the menuitem, don't leak the object_path and device_icon strings if kind == UP_DEVICE_KIND_LINE_POWER. (The function returned unconditionally without freeing the strings.)
 * Don't leak the GIcons returned by get_device_icon() that we use to create the device menuitem's GtkImage.
 * In get_device_icon(), don't leak the fallback GIcon.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Probably should use:

 atk_object_set_name()

Instead of the object property. But otherwise it looks good.

review: Approve
Revision history for this message
Charles Kerr (charlesk) wrote :

> Probably should use atk_object_set_name() instead of the object property

Fixed in r138.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches