aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Window.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-24 09:04:43 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-24 09:04:43 +0200
commit11b534ab008f9f0ac831d96f0426adf4c3561319 (patch)
tree07aab99bf9e98ea7a25c175d5df43da673ebdebd /nx-X11/programs/Xserver/hw/nxagent/Window.c
parent997f2bbd2d27e154b6e44f9936b2b407a74c8664 (diff)
parentcce9756545ab266ccff7ec363907aa25f4d7c1c7 (diff)
downloadnx-libs-11b534ab008f9f0ac831d96f0426adf4c3561319.tar.gz
nx-libs-11b534ab008f9f0ac831d96f0426adf4c3561319.tar.bz2
nx-libs-11b534ab008f9f0ac831d96f0426adf4c3561319.zip
Merge branch 'uli42-pr/codespell' into 3.6.x
Attributes GH PR #686: https://github.com/ArcticaProject/nx-libs/pull/686
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index e2ce9d372..073021ed8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -1752,7 +1752,7 @@ Bool nxagentChangeWindowAttributes(pWin, mask)
}
/*
- * As we set this bit, whe must change dix in
+ * As we set this bit, we must change dix in
* order not to perform PositionWindow and let
* X move children windows for us.
*/
@@ -2635,7 +2635,7 @@ void nxagentMapDefaultWindows(void)
Bool nxagentDisconnectAllWindows(void)
{
- Bool succeded = True;
+ Bool succeeded = True;
int i;
WindowPtr pWin;
@@ -2646,7 +2646,7 @@ Bool nxagentDisconnectAllWindows(void)
for (i = 0; i < screenInfo.numScreens; i++)
{
pWin = screenInfo.screens[i]->root;
- nxagentTraverseWindow( pWin, nxagentDisconnectWindow, &succeded);
+ nxagentTraverseWindow( pWin, nxagentDisconnectWindow, &succeeded);
nxagentDefaultWindows[i] = None;
}
@@ -2654,7 +2654,7 @@ Bool nxagentDisconnectAllWindows(void)
fprintf(stderr, "nxagentDisconnectAllWindows: all windows disconnected\n");
#endif
- return succeded;
+ return succeeded;
}
/*
@@ -3270,7 +3270,7 @@ static void nxagentReconfigureWindow(void * param0, XID param1, void * data_buff
}
/*
XXX: This would break Motif menus.
- If pWin is mapped but not realized, a followin UnmapWindow() wouldn't
+ If pWin is mapped but not realized, a following UnmapWindow() wouldn't
do anything, leaving this mapped window around. XMapWindow()
is called in nxagentRealizeWindow() and there it is enough.
@@ -3387,7 +3387,7 @@ Bool nxagentCheckWindowIntegrity(WindowPtr pWin)
{
#ifdef WARNING
fprintf(stderr, "nxagentCheckWindowIntegrity: Window %p has been realized "
- "now remote and frambuffer data are synchronized.\n", (void*) pWin);
+ "now remote and framebuffer data are synchronized.\n", (void*) pWin);
#endif
}