# HG changeset patch
# User Yu Taninari <you@cr.ie.u-ryukyu.ac.jp>
# Date 1315257800 -32400
# Node ID 29e43be288ca681370a13db85990892dc5910fca
# Parent  ba6e672cc47c1389c5ee5fd2d68b21383ccb4b24# Parent  7aea720eb4853eac90b2f447cbde8fc288baf34b
merge

diff -r ba6e672cc47c -r 29e43be288ca src/myVncClient/EchoClient.java
--- a/src/myVncClient/EchoClient.java	Tue Sep 06 06:20:47 2011 +0900
+++ b/src/myVncClient/EchoClient.java	Tue Sep 06 06:23:20 2011 +0900
@@ -181,7 +181,9 @@
 				 * System.out.println("treenum: " + value.treenum); }
 				 */
 				
+
 				if(!(checkRepetition.equals("skip")) || "1".equals(leaderflag)) {
+
 					Thread.sleep(1000);
 					client.init();
 					client.setEchoValue(this);
@@ -196,6 +198,7 @@
 					echoSocket.close();
 					//runflag = true;
 				}
+
 				/*
 				Thread.sleep(1000);
 				if(checkRepetition.equals("skip") &&!(waitReply.passflag)) {
@@ -203,6 +206,7 @@
 					notfoundParent();					
 				}*/
 				
+
 			} catch (UnknownHostException e) {
 				System.err.println("Trying to connect to unknown host: " + e);
 			} catch (IOException e) {
diff -r ba6e672cc47c -r 29e43be288ca src/myVncClient/MyRfbProto.java
--- a/src/myVncClient/MyRfbProto.java	Tue Sep 06 06:20:47 2011 +0900
+++ b/src/myVncClient/MyRfbProto.java	Tue Sep 06 06:23:20 2011 +0900
@@ -791,8 +791,8 @@
 						writerRunning.set(2);
 						os.close();
 					} catch (IOException e1) {
+						/* if socket closed 	cliList.remove(newCli); */
 					}
-					/* if socket closed 	cliList.remove(newCli); */
 				}
 			}
 
diff -r ba6e672cc47c -r 29e43be288ca src/myVncClient/VncCanvas.java
--- a/src/myVncClient/VncCanvas.java	Tue Sep 06 06:20:47 2011 +0900
+++ b/src/myVncClient/VncCanvas.java	Tue Sep 06 06:23:20 2011 +0900
@@ -371,10 +371,10 @@
 
 		// Start/stop session recording if necessary.
 		viewer.checkRecordingStatus();
-
+/*
 		rfb.writeFramebufferUpdateRequest(0, 0, rfb.framebufferWidth,
 				rfb.framebufferHeight, false);
-
+*/
 		resetStats();
 		boolean statsRestarted = false;
 
@@ -538,7 +538,7 @@
 				// Request framebuffer update if needed.
 				int w = rfb.framebufferWidth;
 				int h = rfb.framebufferHeight;
-				rfb.writeFramebufferUpdateRequest(0, 0, w, h, !fullUpdateNeeded);
+			//	rfb.writeFramebufferUpdateRequest(0, 0, w, h, !fullUpdateNeeded);
 
 				break;