Mercurial > mplayer.hg

changeset 35696:2d3b65e5ae1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename structure member, use singular.
author ib
date Sat, 19 Jan 2013 12:16:50 +0000
parents f1d1404c3828
children 13f8a04c5524
files gui/wm/ws.c gui/wm/ws.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/wm/ws.c	Sat Jan 19 12:12:34 2013 +0000
+++ b/gui/wm/ws.c	Sat Jan 19 12:16:50 2013 +0000
@@ -829,7 +829,7 @@
     win->Property = p;
 
     if (p & wsShowFrame)
-        win->Decorations = True;
+        win->Decoration = True;
 
     wsWindowUpdatePosition(win, x, y, w, h);
 
@@ -916,7 +916,7 @@
     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 @@
     /* 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);
     }
--- a/gui/wm/ws.h	Sat Jan 19 12:12:34 2013 +0000
+++ b/gui/wm/ws.h	Sat Jan 19 12:16:50 2013 +0000
@@ -108,7 +108,7 @@
     unsigned char *bImage;
     XImage *xImage;
     Pixmap Mask;
-    Bool Decorations;
+    Bool Decoration;
 
     int State;
     int Visible;