aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Atoms.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/Atoms.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/Atoms.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Atoms.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index e2d97d2b4..5e578a5fd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -415,8 +415,8 @@ static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool d
/*
* FIXME: We should clean up the atom map
- * at nxagent reset, in order to cancel
- * all the local atoms but still mantaining
+ * at nxagent reset, in order to cancel
+ * all the local atoms but still maintaining
* the Xserver values and the atom names.
*/
@@ -470,8 +470,8 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
}
/*
- * Ask X-Server for ours Atoms
- * ... if successfull cache them too.
+ * Ask X-Server for our Atoms
+ * ... if successful cache them too.
*/
ret_value = XInternAtoms(nxagentDisplay, name_list, list_size, False, atom_list);
@@ -532,7 +532,7 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
}
/*
- * If the nxagent has been resetted,
+ * If the nxagent has been reset,
* the local value of the atoms stored
* in cache could have the value None,
* do not call this function with None.
@@ -639,7 +639,7 @@ Atom nxagentMakeAtom(char *string, unsigned int length, Bool Makeit)
{
/*
* Found Cached by name.
- * It means that nxagent has been resetted,
+ * It means that nxagent has been reset,
* but not the xserver so we still have cached its atoms.
*/