diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2010-02-03 15:38:57 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2010-02-22 17:04:46 -0500 |
| commit | a6cbcf6e782e65f3d4d14202ed0b7a8f65b33c9d (patch) | |
| tree | 9b650a46ceec54785e33e1966165e01eaf49bf32 | |
| parent | ab68c707fd02613d9359120ba6402639dd8bd89e (diff) | |
xselinux: Rename window-related requests that now support pixmaps.
Renamed requests:
SetWindowCreateContext -> SetDrawableCreateContext
GetWindowCreateContext -> GetDrawableCreateContext
GetWindowContext -> GetDrawableContext
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | Xext/xselinux.h | 6 | ||||
| -rw-r--r-- | Xext/xselinux_ext.c | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Xext/xselinux.h b/Xext/xselinux.h index dcd250e76..d82d90350 100644 --- a/Xext/xselinux.h +++ b/Xext/xselinux.h @@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define X_SELinuxGetDeviceCreateContext 2 #define X_SELinuxSetDeviceContext 3 #define X_SELinuxGetDeviceContext 4 -#define X_SELinuxSetWindowCreateContext 5 -#define X_SELinuxGetWindowCreateContext 6 -#define X_SELinuxGetWindowContext 7 +#define X_SELinuxSetDrawableCreateContext 5 +#define X_SELinuxGetDrawableCreateContext 6 +#define X_SELinuxGetDrawableContext 7 #define X_SELinuxSetPropertyCreateContext 8 #define X_SELinuxGetPropertyCreateContext 9 #define X_SELinuxSetPropertyUseContext 10 diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index 1dff32d14..aa5573455 100644 --- a/Xext/xselinux_ext.c +++ b/Xext/xselinux_ext.c @@ -221,7 +221,7 @@ ProcSELinuxGetDeviceContext(ClientPtr client) } static int -ProcSELinuxGetWindowContext(ClientPtr client) +ProcSELinuxGetDrawableContext(ClientPtr client) { DrawablePtr pDraw; PrivateRec **privatePtr; @@ -486,12 +486,12 @@ ProcSELinuxDispatch(ClientPtr client) return ProcSELinuxSetDeviceContext(client); case X_SELinuxGetDeviceContext: return ProcSELinuxGetDeviceContext(client); - case X_SELinuxSetWindowCreateContext: + case X_SELinuxSetDrawableCreateContext: return ProcSELinuxSetCreateContext(client, CTX_WIN); - case X_SELinuxGetWindowCreateContext: + case X_SELinuxGetDrawableCreateContext: return ProcSELinuxGetCreateContext(client, CTX_WIN); - case X_SELinuxGetWindowContext: - return ProcSELinuxGetWindowContext(client); + case X_SELinuxGetDrawableContext: + return ProcSELinuxGetDrawableContext(client); case X_SELinuxSetPropertyCreateContext: return ProcSELinuxSetCreateContext(client, CTX_PRP); case X_SELinuxGetPropertyCreateContext: @@ -574,14 +574,14 @@ SProcSELinuxGetDeviceContext(ClientPtr client) } static int -SProcSELinuxGetWindowContext(ClientPtr client) +SProcSELinuxGetDrawableContext(ClientPtr client) { REQUEST(SELinuxGetContextReq); int n; REQUEST_SIZE_MATCH(SELinuxGetContextReq); swapl(&stuff->id, n); - return ProcSELinuxGetWindowContext(client); + return ProcSELinuxGetDrawableContext(client); } static int @@ -648,12 +648,12 @@ SProcSELinuxDispatch(ClientPtr client) return SProcSELinuxSetDeviceContext(client); case X_SELinuxGetDeviceContext: return SProcSELinuxGetDeviceContext(client); - case X_SELinuxSetWindowCreateContext: + case X_SELinuxSetDrawableCreateContext: return SProcSELinuxSetCreateContext(client, CTX_WIN); - case X_SELinuxGetWindowCreateContext: + case X_SELinuxGetDrawableCreateContext: return ProcSELinuxGetCreateContext(client, CTX_WIN); - case X_SELinuxGetWindowContext: - return SProcSELinuxGetWindowContext(client); + case X_SELinuxGetDrawableContext: + return SProcSELinuxGetDrawableContext(client); case X_SELinuxSetPropertyCreateContext: return SProcSELinuxSetCreateContext(client, CTX_PRP); case X_SELinuxGetPropertyCreateContext: |