Unity

Merge lp:~macslow/unity/unity.fix-832151 into lp:unity

  1. unity.fix-832151
  2. Merge into trunk
Proposed by Mirco Müller
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 1729
Proposed branch: lp:~macslow/unity/unity.fix-832151
Merge into: lp:unity
Diff against target: 10 lines (+1/-0)
1 file modified
plugins/unityshell/src/PanelTray.cpp (+1/-0)
To merge this branch: bzr merge lp:~macslow/unity/unity.fix-832151
Reviewer Review Type Date Requested Status
Gord Allott (community) Approve
Review via email: mp+80476@code.launchpad.net

Description of the change

Be properly unref'ing _tray the FilterTrayCallback should be correctly unregistered and not called again. Fixes LP: 832151

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) wrote :

On 26/10/11 12:24, Mirco Müller wrote:
> Mirco Müller has proposed merging lp:~macslow/unity/unity.fix-832151 into lp:unity.
>
> Requested reviews:
> Unity Team (unity-team)
> Related bugs:
> Bug #832151 in unity: "compiz crashed with SIGSEGV in g_strcmp0()"
> https://bugs.launchpad.net/unity/+bug/832151
>
> For more details, see:
> https://code.launchpad.net/~macslow/unity/unity.fix-832151/+merge/80476
>
> Be properly unref'ing _tray the FilterTrayCallback should be correctly unregistered and not called again. Fixes LP: 832151

 +1
 merge approved

--
Gordon Allott
Canonical Ltd.
27 Floor, Millbank Tower
London SW1P 4QP
www.canonical.com

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/PanelTray.cpp'
2--- plugins/unityshell/src/PanelTray.cpp 2011-10-11 18:18:13 +0000
3+++ plugins/unityshell/src/PanelTray.cpp 2011-10-26 16:31:25 +0000
4@@ -95,6 +95,7 @@
5 if (_tray)
6 {
7 g_signal_handler_disconnect(na_tray_get_manager(_tray), _tray_icon_added_id);
8+ g_object_unref (_tray);
9 _tray = NULL;
10 }
11