aboutsummaryrefslogtreecommitdiff
path: root/doc/nx-X11_vs_XOrg69_patches/NXmiwindow.c.NX.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
commitabd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch)
treeaa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/NXmiwindow.c.NX.patch
parent2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff)
downloadnx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.gz
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.bz2
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.zip
rename original NX patches, so that we can see the patched file's name in the patch file name.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/NXmiwindow.c.NX.patch')
-rw-r--r--doc/nx-X11_vs_XOrg69_patches/NXmiwindow.c.NX.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/NXmiwindow.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/NXmiwindow.c.NX.patch
deleted file mode 100644
index 7d6be7b0c..000000000
--- a/doc/nx-X11_vs_XOrg69_patches/NXmiwindow.c.NX.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- ./nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.X.original 2015-02-13 14:03:44.744441510 +0100
-+++ ./nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c 2015-02-10 19:13:13.776686935 +0100
-@@ -1,3 +1,20 @@
-+/**************************************************************************/
-+/* */
-+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
-+/* */
-+/* NXAGENT, NX protocol compression and NX extensions to this software */
-+/* are copyright of NoMachine. Redistribution and use of the present */
-+/* software is allowed according to terms specified in the file LICENSE */
-+/* which comes in the source distribution. */
-+/* */
-+/* Check http://www.nomachine.com/licensing.html for applicability. */
-+/* */
-+/* NX and NoMachine are trademarks of Medialogic S.p.A. */
-+/* */
-+/* All rights reserved. */
-+/* */
-+/**************************************************************************/
-+
- /* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.9tsi Exp $ */
- /***********************************************************
-
-@@ -1048,8 +1065,29 @@
- bsExposed = (*pScreen->TranslateBackingStore)
- (pWin, 0, 0, pOldClip,
- pWin->drawable.x, pWin->drawable.y);
-+#ifdef NXAGENT_SERVER
-+
-+ /*
-+ * We got a few, rare, segfaults here after having
-+ * started using the backing store. It may be a
-+ * different bug but miChangeSaveUnder() calls mi-
-+ * CheckSubSaveUnder() that, in turn, can change
-+ * the backing store attribute of the window. This
-+ * means that we may try to destroy the region
-+ * even if it was not created at the beginning of
-+ * this function as, at the time, the backing store
-+ * was off. miCheckSubSaveUnder() appear to get a
-+ * pointer to the parent, so maybe doesn't change
-+ * the attribute of the window itself. This is to
-+ * be better investigated.
-+ */
-+
-+ if (WasViewable && pOldClip)
-+ REGION_DESTROY(pScreen, pOldClip);
-+#else
- if (WasViewable)
- REGION_DESTROY(pScreen, pOldClip);
-+#endif
- if (bsExposed)
- {
- RegionPtr valExposed = NullRegion;