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

[Alberts Muktupāvels]

Diff comments:

> diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
> index f415d6c..7492de7 100644
> --- a/plugins/annotate/src/annotate.cpp
> +++ b/plugins/annotate/src/annotate.cpp
> @@ -299,10 +299,12 @@ AnnoScreen::draw (CompAction         *action,
>  
>      if (cr)
>      {
> +	std::string tool_str;
>  	const char	*tool;
>  	unsigned short	*fillColor, *strokeColor;
>  
> -	tool = CompOption::getStringOptionNamed (options, "tool", "line").c_str ();
> +	tool_str = CompOption::getStringOptionNamed (options, "tool", "line");
> +	tool = tool_str.c_str ();

New code looks functionally same, no?

>  
>  	cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
>  	cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
> @@ -345,7 +347,6 @@ AnnoScreen::draw (CompAction         *action,
>  	    double y1 = CompOption::getFloatOptionNamed (options, "y1", 0);
>  	    double x2 = CompOption::getFloatOptionNamed (options, "x2", 100);
>  	    double y2 = CompOption::getFloatOptionNamed (options, "y2", 100);
> -

Unrelated change.

>  	    drawLine (x1, y1, x2, y2, strokeWidth, fillColor);
>  	}
>  	else if (strcasecmp (tool, "text") == 0)
> @@ -384,6 +385,8 @@ AnnoScreen::draw (CompAction         *action,
>  	    drawText (x, y, text, family, size, slant, weight,
>  		      fillColor, strokeColor, strokeWidth);
>  	}
> +    screen->handleEventSetEnabled (this, true);

Indentation is wrong. Otherwise this does not sound like right place to do this...

> +	gScreen->glPaintOutputSetEnabled (this, true);
>      }
>  
>      return true;


-- 
https://code.launchpad.net/~kondor-dani/compiz/+git/compiz/+merge/383948
Your team Compiz Maintainers is requested to review the proposed merge of ~kondor-dani/compiz:annotate_fix into compiz:master.