Revision: 5065
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5065&view=rev
Author: atkac
Date: 2013-03-14 17:52:53 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Initialize VNC extension from libvnc.so only once.
Modified Paths:
--------------
trunk/unix/xserver/hw/vnc/xf86vncModule.cc
Modified: trunk/unix/xserver/hw/vnc/xf86vncModule.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/xf86vncModule.cc 2013-03-14 17:11:22 UTC (rev
5064)
+++ trunk/unix/xserver/hw/vnc/xf86vncModule.cc 2013-03-14 17:52:53 UTC (rev
5065)
@@ -90,26 +90,31 @@
static void vncExtensionInitWithParams(INITARGS)
{
- rfb::initStdIOLoggers();
- rfb::LogWriter::setLogParams("*:stderr:30");
- rfb::Configuration::enableServerParams();
+ static char once = 0;
- for (int scr = 0; scr < screenInfo.numScreens; scr++) {
- ScrnInfoPtr pScrn = xf86Screens[scr];
+ if (!once) {
+ once++;
+ rfb::initStdIOLoggers();
+ rfb::LogWriter::setLogParams("*:stderr:30");
+ rfb::Configuration::enableServerParams();
- for (ParameterIterator i; i.param; i.next()) {
- const char *val;
+ for (int scr = 0; scr < screenInfo.numScreens; scr++) {
+ ScrnInfoPtr pScrn = xf86Screens[scr];
+
+ for (ParameterIterator i; i.param; i.next()) {
+ const char *val;
#if XORG < 112
- val = xf86FindOptionValue(pScrn->options, i.param->getName());
+ val = xf86FindOptionValue(pScrn->options, i.param->getName());
#else
- val = xf86FindOptionValue((XF86OptionPtr)pScrn->options,
i.param->getName());
+ val = xf86FindOptionValue((XF86OptionPtr)pScrn->options,
i.param->getName());
#endif
- if (val)
- i.param->setParam(val);
+ if (val)
+ i.param->setParam(val);
+ }
}
+
+ vncExtensionInit();
}
-
- vncExtensionInit();
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
