Merge lp:~thumper/unity/hacking into lp:unity

[Tim Penhey]

CCSM was deleting and recreating the UnityScreen.

In the past, I had commented out the delete wt (windows thread) in the UnityScreen destructor because it was crashing on exit. This was causing CCSM to initiate a crash in unity as nux doesn't like having multiple threads.

I've fixed the nux dependencies in https://code.launchpad.net/~thumper/nux/view-deletion-after-window-thread/+merge/77256.

Also noticed that the switcher controller wasn't being deleted.

[Jason Smith (jassmith)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-27 16:12:35 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-28 01:49:27 +0000
@@ -315,6 +315,7 @@
     switcher_desktop_icon->UnReference();
   panelController->UnReference();
   delete controller;
+  delete switcherController;
   launcherWindow->UnReference();
 
   notify_uninit();
@@ -334,9 +335,7 @@
   ::unity::ui::IconRenderer::DestroyTextures();
   QuicklistManager::Destroy();
 
-  // Deleting the windows thread calls XCloseDisplay, which calls XSync, which
-  // sits waiting for a reply.
-  // delete wt;
+  delete wt;
 }
 
 void UnityScreen::initAltTabNextWindow()