Unity

Merge lp:~azzar1/unity/properly-remove-software-launcher-icon into lp:unity

  1. properly-remove-software-launcher-icon
  2. Merge into trunk
Proposed by Andrea Azzarone on 2016-04-20
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-04-20
Approved revision: 4102
Merged at revision: 4108
Proposed branch: lp:~azzar1/unity/properly-remove-software-launcher-icon
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
launcher/SoftwareCenterLauncherIcon.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/properly-remove-software-launcher-icon
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2016-04-20
Marco Trevisan (Treviño) 2016-04-20 Approve on 2016-04-20
Review via email: mp+292340@code.launchpad.net

Commit Message

Properly remove SoftwareCenterLauncherIcon in case of failure.

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
2--- launcher/SoftwareCenterLauncherIcon.cpp 2016-03-18 01:47:08 +0000
3+++ launcher/SoftwareCenterLauncherIcon.cpp 2016-04-20 04:23:52 +0000
4@@ -133,7 +133,7 @@
5 else
6 {
7 // failure condition, remove icon again
8- UnStick();
9+ Remove();
10 }
11
12 aptdaemon_trans_.reset();