Merge lp:~mc-return/unity/unity.merge-remove-unused-variables into lp:unity

[MC Return]

Removed the variables 'oldPrev' and 'oldNext' which got assigned the value NULL, but then were never used.

Removes the variables 'oldPrev' and 'oldNext' which got assigned the value NULL, but then were never used.

[MC Return (mc-return)]

Ups, the change to the manual-test was not really intentional...

[lp:~mc-return/unity/unity.merge-remove-unused-variables]

2658. By Nick Dedekind on 2012-09-06

Close preview when dash is hidden. (LP#1045298). Fixes: https://bugs.launchpad.net/bugs/1045298. Approved by Nick Dedekind, Omer Akram, Gord Allott.

2659. By Brandon Schaefer on 2012-09-06

The xim tests will now skip if no XMODIFIERS env var is set.. Approved by Christopher Lee, Thomi Richards.

2660. By Marco Trevisan (Treviño) on 2012-09-06

LauncherModel: rewrite the Reordering functions to keep the icon priority deltas

The priority of the icons added to the model was reset every time the model
was reordered; we should otherwise keep the priority deltas between icons
so that we can safely set them without be worried that a reorder would completely
reset them.
Also add IconIndex method to get the positio of a given icon.. Fixes: https://bugs.launchpad.net/bugs/761155. Approved by Andrea Azzarone.

2661. By Michal Hruby on 2012-09-06

Make sure we can pass extra hints when activating preview actions. Fixes: https://bugs.launchpad.net/bugs/1046352. Approved by Pawel Stolowski, Nick Dedekind.

[Brandon Schaefer (brandontschaefer)]

Changes look good. +1

review: Approve

[lp:~mc-return/unity/unity.merge-remove-unused-variables]

2662. By Renato Araujo Oliveira Filho on 2012-09-06

UnityWindow: scale window code improved

* Fixed code style.
* Moved function "GetWindowName" from UnityWindow to WindowManager.
* Used glib::Object auto pointer instead of "c" pointer;. Fixes: https://bugs.launchpad.net/bugs/1033935, https://bugs.launchpad.net/bugs/1046125. Approved by Marco Trevisan (Treviño).

2663. By Brandon Schaefer on 2012-09-06

The mouse will now cause the HUD buttons to change selection.. Fixes: https://bugs.launchpad.net/bugs/1042692. Approved by Tim Penhey, Gord Allott.

2664. By MC Return on 2012-09-06

"Alt+Space" shortcut to reveal the window menu is not hardcoded, but a Compiz key option
" (Hold)" should also be translated
Made all Compiz plug-in names and all Compiz plug-in option names in unityshell.cpp static constants. Approved by Sam Spilsbury.

2665. By Didier Roche on 2012-09-06

remove unity --reset, it's not anymore really needed now that we are in
stable days of unity and we moved to gsettings. Approved by Michal Hruby.

2666. By MC Return on 2012-09-06

Removed the variables 'oldPrev' and 'oldNext' which got assigned the value NULL, but then were never used.. Approved by Brandon Schaefer.

=== modified file 'manual-tests/Hud.txt'
--- manual-tests/Hud.txt	2012-08-23 23:20:55 +0000
+++ manual-tests/Hud.txt	2012-09-05 20:45:21 +0000
@@ -1,6 +1,6 @@
 Alt+Enter Crash
 ---------------
-Tests that Alt+Enter does not cause unity to crash (LP: #960957)
+Test that Alt+Enter does not cause Compiz/Unity to crash (LP: #960957)
 
 Setup:
 
@@ -11,4 +11,4 @@
   Nothing happens
  
 Wrong Result:
-  Unity/compiz crashes
+  Unity/Compiz crashes

=== modified file 'plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp'
--- plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2012-07-30 16:35:18 +0000
+++ plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2012-09-05 20:45:21 +0000
@@ -223,9 +223,9 @@
 void
 UnityMTGrabHandlesScreen::handleEvent(XEvent* event)
 {
-  CompWindow* w, *oldPrev, *oldNext;
+  CompWindow* w;
 
-  w = oldPrev = oldNext = NULL;
+  w = NULL;
 
   switch (event->type)
   {