From c8b681f00b1d5c7edb66dd536f01d287fae6f9d7 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Thu, 18 Jul 2019 10:52:37 -0300
Subject: [PATCH] Cleaning up unused code. updating v3270 calls.

---
 src/pw3270/actions.c | 29 -----------------------------
 src/pw3270/dialog.c  |  2 +-
 src/pw3270/main.c    |  3 ++-
 src/pw3270/window.c  |  3 +++
 4 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c
index 42ec13d..c9ec2c6 100644
--- a/src/pw3270/actions.c
+++ b/src/pw3270/actions.c
@@ -56,10 +56,6 @@
 	#define GDK_NUMLOCK_MASK GDK_MOD2_MASK
  #endif
 
- #ifdef DEBUG
-	#include <lib3270/html.h>
- #endif
-
  #define ERROR_DOMAIN g_quark_from_static_string(PACKAGE_NAME)
  #define TOGGLE_GDKDEBUG LIB3270_TOGGLE_COUNT+1
 
@@ -281,26 +277,6 @@ static void kp_add_action(GtkAction *action, GtkWidget *widget)
 
 }
 
-#ifdef DEBUG
-static void copy_as_html_action(GtkAction *action, GtkWidget *widget)
-{
-	char 			* text;
-	gchar			* utf;
-	H3270			* session	= v3270_get_session(widget);
-	GtkClipboard	* clipboard	= gtk_widget_get_clipboard(widget,GDK_SELECTION_CLIPBOARD);
-
-	trace_action(action,widget);
-
-	text = lib3270_get_as_html(session,LIB3270_HTML_OPTION_ALL|LIB3270_HTML_OPTION_FORM);
-	utf = g_convert(text, -1, "UTF-8", lib3270_get_display_charset(session), NULL, NULL, NULL);
-	lib3270_free(text);
-
-	gtk_clipboard_set_text(clipboard,utf,-1);
-	g_free(utf);
-
-}
-#endif // DEBUG
-
 G_GNUC_INTERNAL void transfer_action(GtkAction *action, GtkWidget *widget)
 {
 	GtkWidget * dialog = v3270ft_new(gtk_widget_get_toplevel(widget));
@@ -352,12 +328,7 @@ static void connect_standard_action(GtkAction *action, GtkWidget *widget, const 
 		{ "about",			about_dialog_action		},
 		{ "kpsubtract", 	kp_subtract_action		},
 		{ "kpadd",			kp_add_action			},
-//		{ "download",		transfer_action			},
-//		{ "upload",			transfer_action			},
 		{ "transfer",		transfer_action			},
-#ifdef DEBUG
-		{ "copyashtml",		copy_as_html_action		},
-#endif // DEBUG
 	};
 
 	int f;
diff --git a/src/pw3270/dialog.c b/src/pw3270/dialog.c
index 973f98f..a7a3de2 100644
--- a/src/pw3270/dialog.c
+++ b/src/pw3270/dialog.c
@@ -404,7 +404,7 @@
 
 	if(text)
 	{
-		v3270_paste_text(widget,text,encoding);
+		v3270_input_text(widget,text,encoding);
 		g_free(text);
 	}
 
diff --git a/src/pw3270/main.c b/src/pw3270/main.c
index d055a81..f26b69c 100644
--- a/src/pw3270/main.c
+++ b/src/pw3270/main.c
@@ -519,7 +519,6 @@ int main(int argc, char *argv[])
 			gtk_settings_set_string_property(settings,"gtk-menu-bar-accel","Menu","");
 		}
 
-		pw3270_load_plugins(pluginpath);
 		toplevel = pw3270_new(host,systype,syscolors);
 		pw3270_set_session_name(toplevel,session_name);
 
@@ -527,6 +526,8 @@ int main(int argc, char *argv[])
 		pw3270_set_string(toplevel,"application","session",session_name);
 #endif // _WIN32
 
+		pw3270_load_plugins(pluginpath);
+
 		if(toggleset)
 		{
 			gchar **str = g_strsplit(toggleset,",",-1);
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 17de2ae..0030332 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -375,6 +375,9 @@ static GtkWidget * trace_window = NULL;
  LIB3270_EXPORT void pw3270_set_session_name(GtkWidget *widget, const gchar *name)
  {
  	g_return_if_fail(GTK_IS_PW3270(widget));
+
+ 	g_message("************** %s",name);
+
 	v3270_set_session_name(GTK_PW3270(widget)->terminal,name);
  }
 
--
libgit2 0.21.2