Merge lp:~ted/unity/null-icon-info into lp:unity
Proposed by
Ted Gould
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Ted Gould | ||||
Proposed branch: | lp:~ted/unity/null-icon-info | ||||
Merge into: | lp:unity | ||||
Diff against target: |
28 lines (+3/-3) 1 file modified
launcher/LauncherIcon.cpp (+3/-3) |
||||
To merge this branch: | bzr merge lp:~ted/unity/null-icon-info | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Azzarone (community) | Needs Fixing | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+164214@code.launchpad.net |
Commit message
Handle the case where the info could be NULL
Description of the change
This branch sets the initial state (as there is some checking based on it) and uses g_clear_object to set the variable back to NULL after it is unset (and only unsets if it is non-NULL). This should fix the crash reported in bug 1180790.
To post a comment you must log in.
PASSED: Continuous integration, rev:3325 jenkins. qa.ubuntu. com/job/ unity-ci/ 60/ jenkins. qa.ubuntu. com/job/ unity-raring- amd64-ci/ 60 jenkins. qa.ubuntu. com/job/ unity-raring- armhf-ci/ 60 jenkins. qa.ubuntu. com/job/ unity-raring- i386-ci/ 60
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-ci/ 60/rebuild
http://