Merge lp:~unity-team/compiz/plugins-main-trunk.fix_wrong_window_move_expo into lp:~unity-team/compiz/plugins-main-trunk

[Sam Spilsbury]

Fixes typo in expo which caused wrong window to move

[David Barth (dbarth)]

+1

review: Approve

=== modified file 'expo/src/expo.cpp'
--- expo/src/expo.cpp	2011-03-29 16:36:40 +0000
+++ expo/src/expo.cpp	2011-03-31 17:42:06 +0000
@@ -545,8 +545,8 @@
 	    int                              xOffset, yOffset;
 	    CompWindowList::reverse_iterator iter;
 
-	    xOffset = screen->vp ().x () * screen->width ();
-	    yOffset = screen->vp ().y () * screen->height ();
+	    xOffset = screen->vpSize ().x () * screen->width ();
+	    yOffset = screen->vpSize ().y () * screen->height ();
 
 	    dndState = DnDNone;