Unity

Merge lp:~mhr3/unity/fix-1061510-6.0 into lp:unity/6.0

  1. fix-1061510-6.0
  2. Merge into 6.0
Proposed by Michal Hruby on 2012-10-10
Status: Merged
Approved by: Francis Ginther on 2012-10-10
Approved revision: 2772
Merged at revision: 2772
Proposed branch: lp:~mhr3/unity/fix-1061510-6.0
Merge into: lp:unity/6.0
Diff against target: 12 lines (+1/-1)
1 file modified
launcher/TrashLauncherIcon.cpp (+1/-1)
To merge this branch: bzr merge lp:~mhr3/unity/fix-1061510-6.0
Reviewer Review Type Date Requested Status
Łukasz Zemczak 2012-10-10 Approve on 2012-10-10
Review via email: mp+128973@code.launchpad.net

Commit Message

Backport r2821 from trunk - fix refcounting in TrashLauncherIcon

Description of the Change

Backport r2821 from trunk - fix refcounting in TrashLauncherIcon

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

WFM +1

review: Approve
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1520/console reported an error when processing this lp:~mhr3/unity/fix-1061510-6.0 branch.
Not merging it.

Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1521/console reported an error when processing this lp:~mhr3/unity/fix-1061510-6.0 branch.
Not merging it.

Francis Ginther (fginther) wrote :

The unity-merger system had a configuration issue. Hopefully I have it fixed now. Approving again to retry.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/TrashLauncherIcon.cpp'
2--- launcher/TrashLauncherIcon.cpp 2012-09-18 01:13:12 +0000
3+++ launcher/TrashLauncherIcon.cpp 2012-10-10 15:24:42 +0000
4@@ -127,7 +127,7 @@
5
6 if (info)
7 {
8- glib::Object<GIcon> icon(g_file_info_get_icon(info));
9+ glib::Object<GIcon> icon(g_file_info_get_icon(info), glib::AddRef());
10 glib::String icon_string(g_icon_to_string(icon));
11
12 self->icon_name = icon_string.Str();

Subscribers

People subscribed via source and target branches