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

diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index 8d0211d52eda2f8a38f2008c65ee7991449cc138..52273d6ca5e16f420a32fe003701064b26424629 100644 (file)
--- 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 */