From 6958a2c162ebfca738e2ecb1f830235121e08e28 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Mon, 8 Apr 2013 23:10:20 +0000
Subject: [PATCH] Corrigindo empacotamento windows

---
 src/plugins/hllapi/pluginmain.c  |  6 +++---
 src/plugins/rx3270/Makefile.in   |  4 ++--
 src/plugins/rx3270/pluginmain.cc | 16 ++++++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/plugins/hllapi/pluginmain.c b/src/plugins/hllapi/pluginmain.c
index 5add30c..623dd56 100644
--- a/src/plugins/hllapi/pluginmain.c
+++ b/src/plugins/hllapi/pluginmain.c
@@ -31,7 +31,7 @@
  *
  */
 
- #include "server.h"
+ #include "server.h"
 #include <pw3270/plugin.h>
  #include <pw3270/ipcpackets.h>
  #include <lib3270/actions.h>
 
@@ -439,7 +439,7 @@
 	LocalFree(lpMsgBuf);
  }
 
- LIB3270_EXPORT int pw3270_plugin_init(GtkWidget *window)
+ LIB3270_EXPORT int pw3270_plugin_start(GtkWidget *window)
  {
 	char id;
 
@@ -503,7 +503,7 @@
 	return -1;
  }
 
- LIB3270_EXPORT int pw3270_plugin_deinit(GtkWidget *window)
+ LIB3270_EXPORT int pw3270_plugin_stop(GtkWidget *window)
  {
 
 	return 0;
diff --git a/src/plugins/rx3270/Makefile.in b/src/plugins/rx3270/Makefile.in
index f97077b..77e95db 100644
--- a/src/plugins/rx3270/Makefile.in
+++ b/src/plugins/rx3270/Makefile.in
@@ -50,7 +50,7 @@ include ../../include/plugin.mak
 $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS)
+	@$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
 
 $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@)
 	@echo "  CCLD `basename $@`"
@@ -62,7 +62,7 @@ $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ
 $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS)
+	$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
 
 $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o)
 	@echo "  CCLD `basename $@`"
diff --git a/src/plugins/rx3270/pluginmain.cc b/src/plugins/rx3270/pluginmain.cc
index e1f3444..cfe568f 100644
--- a/src/plugins/rx3270/pluginmain.cc
+++ b/src/plugins/rx3270/pluginmain.cc
@@ -98,14 +98,15 @@
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
 
- static plugin			* session	= NULL;
- static GMutex			  mutex;
+ static plugin			* session	= NULL;

#if GTK_CHECK_VERSION(2,32,0)
+ static GMutex			  mutex;
#else
 static GStaticMutex	  mutex = G_STATIC_MUTEX_INIT;
#endif // GTK_CHECK_VERSION
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
  LIB3270_EXPORT int pw3270_plugin_init(GtkWidget *window)
  {
-	g_mutex_init(&mutex);
+#if GTK_CHECK_VERSION(2,32,0)
+	g_mutex_init(&mutex);
#endif // GTK_CHECK_VERSION
 	session = new plugin(lib3270_get_default_session_handle());
 	session->set_plugin();
 	trace("%s: Rexx object is %p",__FUNCTION__,session);
@@ -119,7 +120,8 @@
 		delete session;
 		session = NULL;
 	}
-	g_mutex_clear(&mutex);
+#if GTK_CHECK_VERSION(2,32,0)
+	g_mutex_clear(&mutex);
#endif // GTK_CHECK_VERSION
 	return 0;
  }
 
@@ -363,7 +365,8 @@ extern "C"
 
 	lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p",gtk_action_get_name(action),widget);
 
-	if(!g_mutex_trylock(&mutex))
+#if GTK_CHECK_VERSION(2,32,0)
+	if(!g_mutex_trylock(&mutex))
#else
	if(!g_static_mutex_trylock(&mutex))
#endif // GTK_CHECK_VERSION
 	{
 		GtkWidget *dialog = gtk_message_dialog_new(	GTK_WINDOW(gtk_widget_get_toplevel(widget)),
 													GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -422,7 +425,8 @@ extern "C"
 	}
 
 	gtk_action_set_sensitive(action,TRUE);
-	g_mutex_unlock(&mutex);
+#if GTK_CHECK_VERSION(2,32,0)
+	g_mutex_unlock(&mutex);
#else
	g_static_mutex_unlock(&mutex);
#endif // GTK_CHECK_VERSION
 
  }
 
--
libgit2 0.21.2