From 02b1c4d491466f55c644eb834916a724707e6cdd Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Wed, 8 Aug 2012 13:12:15 +0000
Subject: [PATCH] Atualizando string de licença para remover warning gerado pelo rpmlint

---
 android/res/values/strings.xml                   |  2 +-
 android/res/xml/preferences.xml                  |  2 +-
 android/src/br/com/bb/pw3270/PW3270Activity.java | 21 ++++++++-------------
 android/src/br/com/bb/pw3270/lib3270.java        | 59 ++++++++++++++++++++---------------------------------------
 pw3270.spec.in                                   |  2 +-
 src/lib3270/session.c                            |  1 -
 src/lib3270/util.c                               |  2 +-
 src/pw3270/print.c                               |  3 +++
 8 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 1a29a18..956b803 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -13,7 +13,7 @@
 		<item>X Numérico</item>
 		<item>X Overflow</item>
 		<item>X Inhibit</item>
-		<item>X</item>
+		<item>X Lock</item>
 		<item>X</item>
 		<item>X Resolvendo</item>
 		<item>X Conectando</item>
diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
index ad7ab08..585602d 100644
--- a/android/res/xml/preferences.xml
+++ b/android/res/xml/preferences.xml
@@ -3,7 +3,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory 
-        android:title="Host"
+        android:title="Configuração pw3270"
         android:key="host_category">
 
         <EditTextPreference
diff --git a/android/src/br/com/bb/pw3270/PW3270Activity.java b/android/src/br/com/bb/pw3270/PW3270Activity.java
index 257d64c..8510a65 100644
--- a/android/src/br/com/bb/pw3270/PW3270Activity.java
+++ b/android/src/br/com/bb/pw3270/PW3270Activity.java
@@ -2,6 +2,7 @@ package br.com.bb.pw3270;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -33,17 +34,9 @@ public class PW3270Activity extends Activity
 	private class terminal extends lib3270
 	{
 
-		terminal()
+		terminal(SharedPreferences settings) 
 		{
-			SharedPreferences settings = getSharedPreferences(TAG, 0);
-			hostname	= settings.getString("hostname",hostname);
-			port		= settings.getInt("port",port);
-			ssl			= settings.getBoolean("ssl",ssl);
-
-	    	setToggle("dstrace",settings.getBoolean("dstrace",true));
-	    	setToggle("screentrace",settings.getBoolean("screentrace",true));
-	    	setToggle("eventtrace",settings.getBoolean("eventtrace",true));
-
+			super(settings);
 		}
 
 		public void hideProgressDialog()
@@ -60,7 +53,6 @@ public class PW3270Activity extends Activity
 
 		protected void updateScreen()
 		{
-			// showProgressDialog("Aguarde...");
 			view.reload();
 		}
 		
@@ -125,6 +117,8 @@ public class PW3270Activity extends Activity
     @Override
     public void onCreate(Bundle savedInstanceState)
     {
+		SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);		
+    	
         super.onCreate(savedInstanceState);
 
 		res = getResources();
@@ -138,7 +132,7 @@ public class PW3270Activity extends Activity
 		// http://developer.android.com/reference/android/webkit/WebView.html
 		view = new WebView(this);
 
-		host = new terminal();
+		host = new terminal(settings);
 		view.addJavascriptInterface(host, "pw3270");
 		
 		view.setWebChromeClient(new WebChromeClient());
@@ -183,7 +177,8 @@ public class PW3270Activity extends Activity
 		setContentView(view);
 		view.loadUrl("file:index.html");
 
-		host.connect();
+		if(settings.getString("hostname","") != "")
+			host.connect();
 
     }
 
diff --git a/android/src/br/com/bb/pw3270/lib3270.java b/android/src/br/com/bb/pw3270/lib3270.java
index 5c84947..31be317 100644
--- a/android/src/br/com/bb/pw3270/lib3270.java
+++ b/android/src/br/com/bb/pw3270/lib3270.java
@@ -29,6 +29,8 @@
 package br.com.bb.pw3270;
 
 import java.lang.Thread;
+
+import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.Message;
 import android.os.CountDownTimer;
@@ -55,9 +57,7 @@ public class lib3270
 	DataOutputStream outData = null;
 	DataInputStream inData = null;
 
-	protected String hostname = "3270.df.bb";
-	protected int port = 8023;
-	protected boolean ssl = false;
+	protected SharedPreferences settings;
 
 	// Define the Handler that receives messages from the thread
 	final Handler mHandler = new Handler()
@@ -125,10 +125,17 @@ public class lib3270
 		System.loadLibrary("3270");
 	}
 
-	lib3270()
+	lib3270(SharedPreferences settings)
 	{
-		screenState = 0;
-		mainloop = null;
+		String toggle[] = { "dstrace", "screentrace", "eventtrace", "reconnect" }; 
+		
+		this.settings = settings;
+		this.screenState = 0;
+		this.mainloop = null;
+		
+		for(int f = 0; f < toggle.length; f++)
+			setToggle(toggle[f],settings.getBoolean(toggle[f],false));
+
 	}
 
 	private class timer extends CountDownTimer
@@ -174,30 +181,6 @@ public class lib3270
 		}
 	}
 
-	/*
-	private class byteMessage
-	{
-		byte[] msg;
-		int sz;
-
-		byteMessage(byte[] contents, int len)
-		{
-			msg = contents;
-			sz = len;
-		}
-
-		byte[] getMessage()
-		{
-			return msg;
-		}
-
-		int getLength()
-		{
-			return sz;
-		}
-	}
-	*/
-
 	protected int send_data(byte[] data, int len)
 	{
 		Log.i(TAG, "Bytes a enviar: " + len);
@@ -234,14 +217,16 @@ public class lib3270
 		private boolean connect()
 		{
 			// Connecta no host
-			SocketFactory socketFactory;
-
-			if (hostname == "")
+			SocketFactory	socketFactory;
+			String 			hostname = settings.getString("hostname","");
+			Integer			port = new Integer(settings.getString("port","23"));
+			
+			if (hostname == "" || port == 0)
 				return false;
 
 			postMessage(1, 14, 0);
 
-			if (ssl)
+			if(settings.getBoolean("ssl",false))
 			{
 				// Host é SSL
 				socketFactory = SSLSocketFactory.getDefault();
@@ -255,7 +240,7 @@ public class lib3270
 
 			try
 			{
-				Log.v(TAG,"Getting socket for " + hostname + ":" + Integer.toString(port));
+				Log.v(TAG,"Getting socket for " + hostname + ":" + port.toString());
 				sock = socketFactory.createSocket(hostname, port);
 				outData = new DataOutputStream(sock.getOutputStream());
 				inData = new DataInputStream(sock.getInputStream());
@@ -317,10 +302,6 @@ public class lib3270
 						{
 							Log.i(TAG, Integer.toString(sz) + " bytes recebidos");
 							procRecvdata(in,sz);
-							// Message msg = mHandler.obtainMessage();
-							// msg.what = 6;
-							// msg.obj = new byteMessage(in, sz);
-							// mHandler.sendMessage(msg);
 						} catch (Exception e)
 						{
 							Log.i(TAG, "Erro ao processar dados recebidos: " + e.getLocalizedMessage());
diff --git a/pw3270.spec.in b/pw3270.spec.in
index e5c4772..3086a84 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -62,7 +62,7 @@
 #---[ Packaging ]-----------------------------------------------------------------------------------------------------
 
 Name:           @PACKAGE@
-License:        LGPL
+License:        GPL-2.0
 Group:          System/X11/Terminals
 Version:        @PACKAGE_VERSION@
 Release:        %_release
diff --git a/src/lib3270/session.c b/src/lib3270/session.c
index 0a8fa84..55426ce 100644
--- a/src/lib3270/session.c
+++ b/src/lib3270/session.c
@@ -312,7 +312,6 @@ H3270 * lib3270_session_new(const char *model)
 
 	configured = 1;
 
-
 	lib3270_session_init(hSession, model);
 
 	if(screen_init(hSession))
diff --git a/src/lib3270/util.c b/src/lib3270/util.c
index 8b26245..1b8ab41 100644
--- a/src/lib3270/util.c
+++ b/src/lib3270/util.c
@@ -947,7 +947,7 @@ LIB3270_EXPORT char * lib3270_get_resource_string(H3270 *hSession, const char *f
 {
 #ifdef ANDROID
 
-	#warning Work in progress
+	#warning No resource on Android
 
 #else
 
diff --git a/src/pw3270/print.c b/src/pw3270/print.c
index 7ebc7c2..02c124b 100644
--- a/src/pw3270/print.c
+++ b/src/pw3270/print.c
@@ -360,6 +360,8 @@ static gchar * enum_to_string(GType type, guint enum_value)
 
 	// Show and return
 	gtk_widget_show_all(container);
+
+	trace("%s ends",__FUNCTION__);
  	return G_OBJECT(container);
  }
 
@@ -483,6 +485,7 @@ static gchar * enum_to_string(GType type, guint enum_value)
 	gtk_print_operation_set_print_settings(print,settings);
 	gtk_print_operation_set_default_page_setup(print,setup);
 
+	trace("%s ends",__FUNCTION__);
  	return print;
  }
 
--
libgit2 0.21.2