[MPlayer-cvslog] r35790 - in trunk/gui/wm: ws.c ws.h

[ib]

Author: ib
Date: Sat Jan 19 13:16:50 2013
New Revision: 35790

Log:
Cosmetic: Rename structure member, use singular.

Modified:
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Sat Jan 19 13:12:34 2013	(r35789)
+++ trunk/gui/wm/ws.c	Sat Jan 19 13:16:50 2013	(r35790)
@@ -829,7 +829,7 @@ void wsWindowCreate(wsWindow *win, int x
     win->Property = p;
 
     if (p & wsShowFrame)
-        win->Decorations = True;
+        win->Decoration = True;
 
     wsWindowUpdatePosition(win, x, y, w, h);
 
@@ -916,7 +916,7 @@ void wsWindowCreate(wsWindow *win, int x
     win->WMHints.initial_state = NormalState;
     XSetWMHints(wsDisplay, win->WindowID, &win->WMHints);
 
-    wsWindowDecoration(win, win->Decorations);
+    wsWindowDecoration(win, win->Decoration);
     XStoreName(wsDisplay, win->WindowID, label);
     XmbSetWMProperties(wsDisplay, win->WindowID, label, label, NULL, 0, NULL, NULL, NULL);
 
@@ -1255,7 +1255,7 @@ void wsWindowFullscreen(wsWindow *win)
     /* restore window if window manager doesn't support EWMH */
     if (!(vo_fs_type & vo_wm_FULLSCREEN)) {
         wsSizeHint(win);
-        wsWindowDecoration(win, win->Decorations && !win->isFullScreen);
+        wsWindowDecoration(win, win->Decoration && !win->isFullScreen);
         wsWindowLayer(wsDisplay, win->WindowID, win->isFullScreen);
         XMoveResizeWindow(wsDisplay, win->WindowID, win->X, win->Y, win->Width, win->Height);
     }

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Sat Jan 19 13:12:34 2013	(r35789)
+++ trunk/gui/wm/ws.h	Sat Jan 19 13:16:50 2013	(r35790)
@@ -108,7 +108,7 @@ typedef struct {
     unsigned char *bImage;
     XImage *xImage;
     Pixmap Mask;
-    Bool Decorations;
+    Bool Decoration;
 
     int State;
     int Visible;