The "xc" tree merged with VNC 4.1.1 code.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/merge-with-vnc-4.1.1@526 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/xc/programs/Xserver/vnc/xf86vncModule.cc b/xc/programs/Xserver/vnc/xf86vncModule.cc
index 297f776..ef8ea50 100644
--- a/xc/programs/Xserver/vnc/xf86vncModule.cc
+++ b/xc/programs/Xserver/vnc/xf86vncModule.cc
@@ -1,5 +1,5 @@
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -34,6 +34,8 @@
#undef bool
#undef new
+using namespace rfb;
+
extern void vncExtensionInit();
static void vncExtensionInitWithParams(INITARGS);
@@ -81,11 +83,10 @@
for (int scr = 0; scr < screenInfo.numScreens; scr++) {
ScrnInfoPtr pScrn = xf86Screens[scr];
- rfb::VoidParameter* p;
- for (p = rfb::Configuration::head; p; p = p->_next) {
- char* val = xf86FindOptionValue(pScrn->options, p->getName());
+ for (ParameterIterator i(Configuration::global()); i.param; i.next()) {
+ char* val = xf86FindOptionValue(pScrn->options, i.param->getName());
if (val)
- p->setParam(val);
+ i.param->setParam(val);
}
}