Merge lp:~3v1n0/unity/scale-crash-fix-1052683 into lp:unity

[Marco Trevisan (Treviño)]

UnityWindow: implements sigc::trackable

UnityWindow connects to signals using sigc::mem_fun, we should inherit from sigc::trackable to be sure that the signals get disconnected properly.

[Brandon Schaefer (brandontschaefer)]

Looks good to me . +1

review: Approve

[Omer Akram (om26er)]

fix for 6.0 please ;-)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-09-18 18:53:43 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-09-18 22:00:25 +0000
@@ -3682,7 +3682,7 @@
 
 void UnityWindow::OnInitiateSpreed()
 {
-  auto const windows = screen->windows();
+  auto const& windows = screen->windows();
   if (std::find(windows.begin(), windows.end(), window) == windows.end())
     return;
 
@@ -3698,7 +3698,7 @@
 
 void UnityWindow::OnTerminateSpreed()
 {
-  auto const windows = screen->windows();
+  auto const& windows = screen->windows();
   if (std::find(windows.begin(), windows.end(), window) == windows.end())
     return;
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-09-18 01:41:46 +0000
+++ plugins/unityshell/src/unityshell.h	2012-09-18 22:00:25 +0000
@@ -344,7 +344,8 @@
   public compiz::WindowInputRemoverLockAcquireInterface,
   public WrapableHandler<ScaleWindowInterface, 4>,
   public BaseSwitchWindow,
-  public PluginClassHandler <UnityWindow, CompWindow>
+  public PluginClassHandler <UnityWindow, CompWindow>,
+  public sigc::trackable
 {
 public:
   UnityWindow(CompWindow*);