Win32 vncviewer merged with VNC 4.1.1 code. The merge is incomplete - the code compiles but does not always work properly yet.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/merge-with-vnc-4.1.1@552 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/vncviewer/InfoDialog.h b/vncviewer/InfoDialog.h
index 7a64d38..752d53c 100644
--- a/vncviewer/InfoDialog.h
+++ b/vncviewer/InfoDialog.h
@@ -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
@@ -30,15 +30,15 @@
 
   namespace win32 {
 
-    class CView;
+    class CConn;
 
     class InfoDialog : Dialog {
     public:
-      InfoDialog() : Dialog(GetModuleHandle(0)), view(0) {}
-      virtual bool showDialog(CView* vw);
+      InfoDialog() : Dialog(GetModuleHandle(0)), conn(0) {}
+      virtual bool showDialog(CConn* vw);
       virtual void initDialog();
     protected:
-      CView* view;
+      CConn* conn;
     };
 
   };