aboutsummaryrefslogtreecommitdiffstats
path: root/unix/xserver113.patch
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2013-05-08 11:22:04 +0000
committerPierre Ossman <ossman@cendio.se>2013-05-08 11:22:04 +0000
commit5cb75ac9bbd3b445b883bb470b7a77387e079620 (patch)
tree2d7d181ae2b4f02652a152227f8c417c431c8c6f /unix/xserver113.patch
parent6f26548e0dde309feec7d8d6fd5cf6bd4186f60e (diff)
downloadtigervnc-5cb75ac9bbd3b445b883bb470b7a77387e079620.tar.gz
tigervnc-5cb75ac9bbd3b445b883bb470b7a77387e079620.zip
VNC needs to be initialised early to get its hooks at a proper
place. The new patch for 1.13+ broke at least animated cursors by moving VNC further down the init list. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5095 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver113.patch')
-rw-r--r--unix/xserver113.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/unix/xserver113.patch b/unix/xserver113.patch
index e0a03d84..da0d590d 100644
--- a/unix/xserver113.patch
+++ b/unix/xserver113.patch
@@ -80,13 +80,13 @@ diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
/* The following is only a small first step towards run-time
* configurable extensions.
*/
-@@ -299,6 +303,9 @@ static ExtensionModule staticExtensions[
- #ifdef XSELINUX
- {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
- #endif
+@@ -238,6 +242,9 @@ EnableDisableExtensionError(const char *
+
+ /* List of built-in (statically linked) extensions */
+ static ExtensionModule staticExtensions[] = {
+#ifdef TIGERVNC
+ {vncExtensionInit, "VNC-EXTENSION", NULL},
+#endif
- };
-
- static ExtensionModule *ExtensionModuleList = NULL;
+ {GEExtensionInit, "Generic Event Extension", &noGEExtension},
+ {ShapeExtensionInit, "SHAPE", NULL},
+ #ifdef MITSHM