[fusion-commits] compiz mirror: Changes to 'master' (bc57bdd2c2898eafdba452fd695c956044019464)

[compiz at server.beryl-project.org]

New commits:
commit bc57bdd2c2898eafdba452fd695c956044019464
Author: Dennis Kasprzyk <onestone at opencompositing.org>
Date:   Thu Jul 5 03:20:48 2007 +0200

    Initialize edge button properly from metadata.

commit 0f3c29687e37d3d09a3e8598fa799c369363a998
Author: Dennis Kasprzyk <onestone at opencompositing.org>
Date:   Thu Jul 5 03:18:04 2007 +0200

    Edge button actions depend on CompActionStateInitEdge state.


 src/event.c    |    4 ++--
 src/metadata.c |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)


Modified: compiz/src/event.c
===================================================================
--- compiz/src/event.c
+++ compiz/src/event.c
@@ -309,8 +309,8 @@ triggerButtonPressBindings (CompDisplay *d,
 
 	if (edge)
 	{
-	    if (isInitiateBinding (option, CompBindingTypeEdgeButton, state,
-				   &action))
+	    if (isInitiateBinding (option, CompBindingTypeEdgeButton,
+				   CompActionStateInitEdge, &action))
 	    {
 		if (action->edgeMask & edge)
 		{

Modified: compiz/src/metadata.c
===================================================================
--- compiz/src/metadata.c
+++ compiz/src/metadata.c
@@ -633,6 +633,8 @@ initActionValue (CompDisplay	 *d,
 	    if (value)
 	    {
 		v->action.edgeButton = strtol ((char *) value, NULL, 0);
+		if (v->action.edgeButton > 0)
+		    v->action.type |= CompBindingTypeEdgeButton;
 		xmlFree (value);
 	    }
 	}