[beryl-commits] compiz mirror: Changes to 'master' (8d38c0db12bb93cddc71617c0c60a69b9b37bf22)

[compiz at server.beryl-project.org]

New commits:
commit 8d38c0db12bb93cddc71617c0c60a69b9b37bf22
Author: Danny Baumann <dannybaumann at web.de>
Date:   Wed Jun 6 09:54:44 2007 +0200

    Rename scale's displayPrivateIndex to scaleDisplayPrivateIndex so that wrapping plugins can have their own displayPrivateIndex.


 include/scale.h |    2 +-
 plugins/scale.c |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)


Modified: compiz/include/scale.h
===================================================================
--- compiz/include/scale.h
+++ compiz/include/scale.h
@@ -150,7 +150,7 @@ typedef struct _ScaleWindow {
 } ScaleWindow;
 
 #define GET_SCALE_DISPLAY(d)				      \
-    ((ScaleDisplay *) (d)->privates[displayPrivateIndex].ptr)
+    ((ScaleDisplay *) (d)->privates[scaleDisplayPrivateIndex].ptr)
 
 #define SCALE_DISPLAY(d)		     \
     ScaleDisplay *sd = GET_SCALE_DISPLAY (d)

Modified: compiz/plugins/scale.c
===================================================================
--- compiz/plugins/scale.c
+++ compiz/plugins/scale.c
@@ -43,7 +43,7 @@
 
 static CompMetadata scaleMetadata;
 
-static int displayPrivateIndex;
+static int scaleDisplayPrivateIndex;
 
 #define NUM_OPTIONS(s) (sizeof ((s)->opt) / sizeof (CompOption))
 
@@ -1697,7 +1697,7 @@ scaleInitDisplay (CompPlugin  *p,
     }
 
     sd->opt[SCALE_DISPLAY_OPTION_ABI].value.i   = SCALE_ABIVERSION;
-    sd->opt[SCALE_DISPLAY_OPTION_INDEX].value.i = displayPrivateIndex;
+    sd->opt[SCALE_DISPLAY_OPTION_INDEX].value.i = scaleDisplayPrivateIndex;
 
     sd->screenPrivateIndex = allocateScreenPrivateIndex (d);
     if (sd->screenPrivateIndex < 0)
@@ -1717,7 +1717,7 @@ scaleInitDisplay (CompPlugin  *p,
 
     WRAP (sd, d, handleEvent, scaleHandleEvent);
 
-    d->privates[displayPrivateIndex].ptr = sd;
+    d->privates[scaleDisplayPrivateIndex].ptr = sd;
 
     return TRUE;
 }
@@ -1884,8 +1884,8 @@ scaleInit (CompPlugin *p)
 					 SCALE_SCREEN_OPTION_NUM))
 	return FALSE;
 
-    displayPrivateIndex = allocateDisplayPrivateIndex ();
-    if (displayPrivateIndex < 0)
+    scaleDisplayPrivateIndex = allocateDisplayPrivateIndex ();
+    if (scaleDisplayPrivateIndex < 0)
     {
 	compFiniMetadata (&scaleMetadata);
 	return FALSE;
@@ -1899,7 +1899,7 @@ scaleInit (CompPlugin *p)
 static void
 scaleFini (CompPlugin *p)
 {
-    freeDisplayPrivateIndex (displayPrivateIndex);
+    freeDisplayPrivateIndex (scaleDisplayPrivateIndex);
     compFiniMetadata (&scaleMetadata);
 }