Revision: 5130
http://sourceforge.net/p/tigervnc/code/5130
Author: ossman_
Date: 2013-08-19 14:36:26 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
The screen index was removed in 1.13, not 1.12.
Bug found and patched by Koichiro IWAO.
Modified Paths:
--------------
trunk/unix/xserver/hw/vnc/vncHooks.cc
Modified: trunk/unix/xserver/hw/vnc/vncHooks.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/vncHooks.cc 2013-07-04 13:42:28 UTC (rev
5129)
+++ trunk/unix/xserver/hw/vnc/vncHooks.cc 2013-08-19 14:36:26 UTC (rev
5130)
@@ -119,7 +119,7 @@
// screen functions
-#if XORG < 112
+#if XORG <= 112
static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
#else
static Bool vncHooksCloseScreen(ScreenPtr pScreen);
@@ -140,7 +140,7 @@
DeviceIntPtr pDev,
#endif
ScreenPtr pScreen, CursorPtr cursor);
-#if XORG < 112
+#if XORG <= 112
static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
pointer pReadmask);
#else
@@ -367,7 +367,7 @@
// CloseScreen - unwrap the screen functions and call the original CloseScreen
// function
-#if XORG < 112
+#if XORG <= 112
static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
#else
static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
@@ -405,7 +405,7 @@
DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
-#if XORG < 112
+#if XORG <= 112
return (*pScreen->CloseScreen)(i, pScreen);
#else
return (*pScreen->CloseScreen)(pScreen);
@@ -574,7 +574,7 @@
// BlockHandler - ignore any changes during the block handler - it's likely
// these are just drawing the cursor.
-#if XORG < 112
+#if XORG <= 112
static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
pointer pReadmask)
#else
@@ -582,7 +582,7 @@
pointer pReadmask)
#endif
{
-#if XORG < 112
+#if XORG <= 112
SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
#else
SCREEN_UNWRAP(pScreen_, BlockHandler);
@@ -590,7 +590,7 @@
vncHooksScreen->desktop->ignoreHooks(true);
-#if XORG < 112
+#if XORG <= 112
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
#else
(*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
