global structures/functions should have "rfb", "sra" or "zrle" as prefix,

while structure members should not

1 files changed, 4 insertions, 4 deletions

diff --git a/contrib/zippy.c b/contrib/zippy.c
index 8d680b8..c535b86 100644
--- a/contrib/zippy.c
+++ b/contrib/zippy.c
@@ -29,7 +29,7 @@ int main (int argc, char **argv)
         server = rfbGetScreen (&argc, argv, maxx, maxy, 8, 3, bpp);
 	server->desktopName = "Zippy das wundersquirrel\'s VNC server";
 	server->frameBuffer = (char*)malloc(maxx*maxy*bpp);
-	server->rfbAlwaysShared = TRUE;
+	server->alwaysShared = TRUE;
         server->kbdAddEvent = on_key_press;
 	server->ptrAddEvent = on_mouse_event;
 
@@ -76,7 +76,7 @@ void draw_primary_colors (char* frame_buffer, int x1, int y1, int x2, int y2)
 /* Dscho's versions (slower, but works for bpp != 3 or 4) */
 void draw_primary_colours_generic(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2)
 {
-  rfbPixelFormat f=s->rfbServerFormat;
+  rfbPixelFormat f=s->serverFormat;
   int i,j;
   for(j=y1;j<y2;j++)
     for(i=x1;i<x2;i++)
@@ -90,7 +90,7 @@ void draw_primary_colours_generic(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2
 
 void draw_primary_colours_generic_fast(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2)
 {
-  rfbPixelFormat f=s->rfbServerFormat;
+  rfbPixelFormat f=s->serverFormat;
   int i,j,y3=(y1*2+y2)/3,y4=(y1+y2*2)/3;
   /* draw first pixel */
   rfbDrawPixel(s,x1,y1,f.redMax<<f.redShift);
@@ -108,7 +108,7 @@ void draw_primary_colours_generic_fast(rfbScreenInfoPtr s,int x1,int y1,int x2,i
 
 void draw_primary_colours_generic_ultrafast(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2)
 {
-  rfbPixelFormat f=s->rfbServerFormat;
+  rfbPixelFormat f=s->serverFormat;
   int y3=(y1*2+y2)/3,y4=(y1+y2*2)/3;
   /* fill rectangles */
   rfbFillRect(s,x1,y1,x2,y3,f.redMax<<f.redShift);