[Merge] ~kondor-dani/compiz:annotate_fix2 into compiz:master

[Dmitry Shachnev]

Diff comments:

> diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
> index f415d6c..95cc98f 100644
> --- a/plugins/annotate/src/annotate.cpp
> +++ b/plugins/annotate/src/annotate.cpp
> @@ -319,7 +319,7 @@ AnnoScreen::draw (CompAction         *action,
>  	strokeWidth = CompOption::getFloatOptionNamed (options, "stroke_width",
>  						       strokeWidth);
>  
> -	if (strcasecmp (tool, "rectangle") == 0)
> +	if (strcasecmp (tool.c_str (), "rectangle") == 0)

Maybe you can just use `if (tool == "rectangle")` here (and similar comparisons below)?

>  	{
>  	    double x = CompOption::getFloatOptionNamed (options, "x", 0);
>  	    double y = CompOption::getFloatOptionNamed (options, "y", 0);


-- 
https://code.launchpad.net/~kondor-dani/compiz/+git/compiz/+merge/383958
Your team Compiz Maintainers is subscribed to branch compiz:master.