changeset 136:d2decb2f0eb8

merge 135
author nobuyasu <dimolto@cr.ie.u-ryukyu.ac.jp>
date Tue, 30 Aug 2011 15:23:14 +0900
parents 7929f447692f (diff) c3ae65fea76a (current diff)
children e97c0f82eaf0
files src/myVncProxy/MyRfbProto.java
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/myVncProxy/MyRfbProto.java	Tue Aug 30 06:50:58 2011 +0900
+++ b/src/myVncProxy/MyRfbProto.java	Tue Aug 30 15:23:14 2011 +0900
@@ -366,7 +366,7 @@
 
 	void sendDataToClient() throws Exception {
 		regiFramebufferUpdate();
-		printFramebufferUpdate();
+//		printFramebufferUpdate();
 		int dataLen = checkAndMark();
 		readSendData(dataLen);		
 	}
@@ -635,7 +635,8 @@
 			bufs.add(b);
 		}
 		multicastqueue.put(bufs);
-		is.reset();
+//		is.reset();
+		return ;
 		}
 	is.reset();
 
--- a/src/myVncProxy/OptionsNoFrame.java	Tue Aug 30 06:50:58 2011 +0900
+++ b/src/myVncProxy/OptionsNoFrame.java	Tue Aug 30 15:23:14 2011 +0900
@@ -74,14 +74,14 @@
   // Constructor.  Set up the labels and choices from the names and values
   // arrays.
   //
-/*
+
   OptionsNoFrame(VncProxyService v) {
 	    viewer = v;
 	    preferredEncoding = -1;
   }	    
-*/
-//  OptionsNoFrame(VncProxyService v, VncCanvas vc) {
-  OptionsNoFrame(VncProxyService v) {
+
+  OptionsNoFrame(VncProxyService v, VncCanvas vc) {
+//  OptionsNoFrame(VncProxyService v) {
 	    viewer = v;    
 
     for (int i = 0; i < names.length; i++) {