summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Åstrand <astrand@cendio.se>2009-03-13 09:45:24 +0000
committerPeter Åstrand <astrand@cendio.se>2009-03-13 09:45:24 +0000
commitc594c0d549aebfc1d3f227ab1baf6e4830f6ef58 (patch)
tree2abc1d93b1a9288d9471582f8ad3e84ad68d9789
parent26af65fb834d951df62e01c2de2436024e9f6d38 (diff)
downloadtigervnc-c594c0d549aebfc1d3f227ab1baf6e4830f6ef58.tar.gz
tigervnc-c594c0d549aebfc1d3f227ab1baf6e4830f6ef58.zip
Do not explicitly enable backing store support, but instead fall back
on the normal Xserver defaults and settings. This currently means that backing store support will be off by default. This avoids http://bugs.freedesktop.org/show_bug.cgi?id=19654 and allows us to run KDE4. Also, call miInitializeBackingStore() in the same location as Xvfb calls it. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3668 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--unix/xserver/hw/vnc/xvnc.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index 8d0211d5..52273d6c 100644
--- a/unix/xserver/hw/vnc/xvnc.cc
+++ b/unix/xserver/hw/vnc/xvnc.cc
@@ -1145,7 +1145,7 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
if (!ret) return FALSE;
- /* miInitializeBackingStore(pScreen); */
+ miInitializeBackingStore(pScreen);
/*
* Circumvent the backing store that was just initialised. This amounts
@@ -1203,11 +1203,6 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
pvfb->closeScreen = pScreen->CloseScreen;
pScreen->CloseScreen = vfbCloseScreen;
-#ifndef NO_INIT_BACKING_STORE
- miInitializeBackingStore(pScreen);
- pScreen->backingStoreSupport = Always;
-#endif
-
return ret;
} /* end vfbScreenInit */