[[project @ 3]
ipauldev**20081124045612
 Ignore-this: 59a5b56b7476ad378d2cf5b37ef9eff6
 Updates to remove errors, warnings, and update for G1 and latest SDK 1.0.
] hunk ./androidVNC/.classpath 4
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.project.AndroidClasspathContainerInitializer"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
hunk ./androidVNC/AndroidManifest.xml 13
+<uses-permission android:name="android.permission.INTERNET"></uses-permission>
hunk ./androidVNC/src/android/androidVNC/CanvasView.java 27
-import android.util.Log;
+//import android.util.Log;
hunk ./androidVNC/src/android/androidVNC/CapsContainer.java 34
-    infoMap = new Hashtable(64, (float)0.25);
-    orderedList = new Vector(32, 8);
+    infoMap = new Hashtable<Integer, CapabilityInfo>(64, (float)0.25);
+    orderedList = new Vector<Integer>(32, 8);
hunk ./androidVNC/src/android/androidVNC/CapsContainer.java 101
-  protected Hashtable infoMap;
-  protected Vector orderedList;
+  protected Hashtable<Integer, CapabilityInfo> infoMap;
+  protected Vector<Integer> orderedList;
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 65
+			
+			Paint textFormat = new Paint(1);
+			textFormat.setColor(Color.LTGRAY);
+			canvas.drawText("Connecting. Please wait...", 20, 30, textFormat);
+			
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 130
-      Log.v(TAG, "Connecting to" + server + ", port" + port + "...");
+      Log.v(TAG, "Connecting to " + server + ", port " + port + "...");
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 184
-      mbitmap = Bitmap.createBitmap(rfb.framebufferWidth, rfb.framebufferHeight, false);
+      mbitmap = Bitmap.createBitmap(rfb.framebufferWidth, rfb.framebufferHeight, Bitmap.Config.RGB_565);
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 341
-        	  boolean cursorPosReceived = false;
+        	  //boolean cursorPosReceived = false;
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 349
-        		  if (rfb.updateRectEncoding == rfb.EncodingLastRect){
+        		  if (rfb.updateRectEncoding == RfbProto.EncodingLastRect){
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 354
-        		  if (rfb.updateRectEncoding == rfb.EncodingNewFBSize) {
+        		  if (rfb.updateRectEncoding == RfbProto.EncodingNewFBSize) {
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 361
-        		  if (rfb.updateRectEncoding == rfb.EncodingXCursor ||
-        				  rfb.updateRectEncoding == rfb.EncodingRichCursor) {
+        		  if (rfb.updateRectEncoding == RfbProto.EncodingXCursor ||
+        				  rfb.updateRectEncoding == RfbProto.EncodingRichCursor) {
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 369
-        		  if (rfb.updateRectEncoding == rfb.EncodingPointerPos) {
+        		  if (rfb.updateRectEncoding == RfbProto.EncodingPointerPos) {
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 371
-        			  cursorPosReceived = true;
+        			  //cursorPosReceived = true;
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 462
-        	  String s = rfb.readServerCutText();
+        	  //String s = rfb.readServerCutText();