[fusion-commits] Compiz configuration system library: Changes to 'master' (687209b94a335e41eb0253b142ed40118ba52242)

[marex at server.beryl-project.org]

New commits:
commit 687209b94a335e41eb0253b142ed40118ba52242
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Wed Jul 4 14:52:21 2007 +0200

    Revert "Added functions to convert the edge button mask to stringlist and the"
    
    This reverts commit 95f2c0d379ba3d665f1183e539ea597ec677d7b6.


 src/bindings.c |   42 +++++++-----------------------------------
 1 files changed, 7 insertions(+), 35 deletions(-)


Modified: fusion/compizconfig/libcompizconfig/src/bindings.c
===================================================================
--- fusion/compizconfig/libcompizconfig/src/bindings.c
+++ fusion/compizconfig/libcompizconfig/src/bindings.c
@@ -239,63 +239,35 @@ ccsStringToButtonBinding (const char           *binding,
 }
 
 CCSStringList
-ccsEdgeMaskToStringList (int edgeMask)
+ccsEdgesToStringList (CCSSettingActionValue *action)
 {
     CCSStringList ret = NULL;
     int i;
 
     for (i = 0; i < N_EDGES; i++)
-	if (edgeMask & (1 << i))
+	if (action->edgeMask & (1 << i))
 	    ret = ccsStringListAppend(ret, strdup(edgeName[i]));
 
     return ret;
 }
 
-int
-ccsStringListToEdgeMask (CCSStringList edges)
+void
+ccsStringListToEdges (CCSStringList         edges, 
+		      CCSSettingActionValue *action)
 {
     int i;
-    int edgeMask;
     CCSStringList l;
 
-    edgeMask = 0;
+    action->edgeMask = 0;
 
     for (l = edges; l; l = l->next)
     {
         for (i = 0; i < N_EDGES; i++)
         {
 	    if (strcmp(l->data, edgeName[i]) == 0)
-	        edgeMask |= (1 << i);
+	        action->edgeMask |= (1 << i);
         }
     }
-
-    return edgeMask;
-}
-
-CCSStringList
-ccsEdgesToStringList (CCSSettingActionValue *action)
-{
-    return ccsEdgeMaskToStringList(action->edgeMask);
-}
-
-void
-ccsStringListToEdges (CCSStringList         edges, 
-		      CCSSettingActionValue *action)
-{
-    action->edgeMask = ccsStringListToEdgeMask(edges);
-}
-
-CCSStringList
-ccsEdgeButtonsToStringList (CCSSettingActionValue *action)
-{
-    return ccsEdgeMaskToStringList(action->edgeButton);
-}
-
-void
-ccsStringListToEdgeButtons (CCSStringList         edgeButtons, 
-			    CCSSettingActionValue *action)
-{
-    action->edgeButton = ccsStringListToEdgeMask(edgeButtons);
 }
 
 Bool