Merge lp:~mkhu/compiz/compiz_fix_put_to_arbitrary_viewport into lp:compiz/0.9.9

[Micheal Hsu]

put: Don't resize the option vector every time PutScreen::toViewport is called - this will leave stale values in the option vector. Instead, check if the option exists already and resize the vector that.

(LP: #1160710)

in put.cpp:

bool PutScreen::toViewport (....)

the function resized the CompOption every time it's called.(this can cause memory leak).
subsequent calls to getIntOptionNamed(..) always return the first "viewport" value instead of of the correct value, which is appended to the tail of the vector.
the correct way is to find the "viewport" option and then set its value.

[Sam Spilsbury (smspillaz)]

Yep, this makes sense. Thanks for that.

Did you see any other plugins which had similar behaviour? Might be good to get them fixed first.

review: Approve

[Sam Spilsbury (smspillaz)]

> Yep, this makes sense. Thanks for that.
>
> Did you see any other plugins which had similar behaviour? Might be good to
> get them fixed first.

*Fixed too.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/put/src/put.cpp'
--- plugins/put/src/put.cpp	2012-09-05 16:42:03 +0000
+++ plugins/put/src/put.cpp	2013-03-27 05:26:18 +0000
@@ -1181,10 +1181,18 @@
 		       CompOption::Vector &option,
 		       int vp)
 {
-    int last = option.size ();
-    option.resize(last+1);
-    option[last].setName ("viewport",CompOption::TypeInt);
-    option[last].value ().set (vp-1);
+    unsigned int index;
+    if (CompOption::findOption (option, "viewport", &index) == NULL)
+    {
+	int last = option.size ();
+	option.resize(last+1);
+	option[last].setName ("viewport",CompOption::TypeInt);
+	option[last].value ().set (vp-1);
+    }
+    else
+    {
+	option[index].value ().set (vp-1);
+    }
 
     return initiateCommon (action, state, option, (PutType) PutViewport);
 }