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

[Mirco Müller]

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

[Gord Allott (gordallott)]

On 26/10/11 12:23, Mirco Müller wrote:
> Mirco Müller has proposed merging lp:~macslow/unity/unity-4.0.fix-832151 into lp:unity/4.0.
>
> 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-4.0.fix-832151/+merge/80474
>
> Be properly unref'ing _tray the FilterTrayCallback should be correctly unregistered and not called again. Fixes LP: 832151

looks good,

 +1
 merge approved

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

review: Approve

[Tim Penhey (thumper)]

Can you get this one merged?

=== modified file 'plugins/unityshell/src/PanelTray.cpp'
--- plugins/unityshell/src/PanelTray.cpp	2011-09-08 11:53:46 +0000
+++ plugins/unityshell/src/PanelTray.cpp	2011-10-26 16:22:23 +0000
@@ -95,6 +95,7 @@
   if (_tray)
   {
     g_signal_handler_disconnect(na_tray_get_manager(_tray), _tray_icon_added_id);
+    g_object_unref(_tray);
     _tray = NULL;
   }