diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c
index ebfecd7..96a9f91 100644
--- a/src/pw3270/actions.c
+++ b/src/pw3270/actions.c
@@ -285,7 +285,7 @@ static void connect_standard_action(GtkAction *action, GtkWidget *widget, const 
 
 static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
 {
-	LIB3270_TOGGLE toggle = (LIB3270_TOGGLE) g_object_get_data(G_OBJECT(action),"toggle_id");
+	LIB3270_TOGGLE toggle = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
 
 	lib3270_trace_event(NULL,"Action %s toggled on widget %p (id=%d)\n",gtk_action_get_name(GTK_ACTION(action)),widget,(int) toggle);
 
@@ -298,17 +298,17 @@ static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
 static void selection_move_action(GtkAction *action, GtkWidget *widget)
 {
 	trace_action(action,widget);
-	lib3270_move_selection(v3270_get_session(widget),(LIB3270_DIRECTION) g_object_get_data(G_OBJECT(action),"direction"));
+	lib3270_move_selection(v3270_get_session(widget),(LIB3270_DIRECTION) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"direction")));
 }
 
 static void cursor_move_action(GtkAction *action, GtkWidget *widget)
 {
-	int flags = (int) g_object_get_data(G_OBJECT(action),"move_flags");
+	int flags = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"move_flags"));
 
 	lib3270_trace_event(NULL,"Action %s activated on widget %p flags=%04x\n",
 									gtk_action_get_name(action),
 									widget,
-									(unsigned int) g_object_get_data(G_OBJECT(action),"move_flags"));
+									(unsigned int) flags);
 
 	lib3270_move_cursor(v3270_get_session(widget),(LIB3270_DIRECTION) (flags & 0x03), (flags & 0x80) );
 }
@@ -323,12 +323,12 @@ static void connect_move_action(GtkAction *action, GtkWidget *widget, const gcha
 
 	if(!g_ascii_strcasecmp(target,"selection"))
 	{
-		g_object_set_data(G_OBJECT(action),"direction",(gpointer) (flags & 3));
+		g_object_set_data(G_OBJECT(action),"direction",GINT_TO_POINTER((flags & 3)));
 		g_signal_connect(action,"activate",G_CALLBACK(selection_move_action),widget);
 	}
 	else if(!g_ascii_strcasecmp(target,"cursor"))
 	{
-		g_object_set_data(G_OBJECT(action),"move_flags",(gpointer) ((int) flags));
+		g_object_set_data(G_OBJECT(action),"move_flags",GINT_TO_POINTER( ((int) flags)));
 		g_signal_connect(action,"activate",G_CALLBACK(cursor_move_action),widget);
 	}
 	else
@@ -343,26 +343,28 @@ static void connect_move_action(GtkAction *action, GtkWidget *widget, const gcha
 
 static void action_pfkey(GtkAction *action, GtkWidget *widget)
 {
-	lib3270_trace_event(NULL,"Action %s activated on widget %p key=%p\n",gtk_action_get_name(action),widget,g_object_get_data(G_OBJECT(action),"pfkey"));
-	lib3270_pfkey(v3270_get_session(widget),(int) g_object_get_data(G_OBJECT(action),"pfkey"));
+	int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pfkey"));
+	lib3270_trace_event(NULL,"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key);
+	lib3270_pfkey(v3270_get_session(widget),key);
 }
 
 static void action_pakey(GtkAction *action, GtkWidget *widget)
 {
-	lib3270_trace_event(NULL,"Action %s activated on widget %p key=%p\n",gtk_action_get_name(action),widget,g_object_get_data(G_OBJECT(action),"pakey"));
-	lib3270_pakey(v3270_get_session(widget),(int) g_object_get_data(G_OBJECT(action),"pakey"));
+	int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pakey"));
+	lib3270_trace_event(NULL,"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key);
+	lib3270_pakey(v3270_get_session(widget),key);
 }
 
 static void action_set_toggle(GtkAction *action, GtkWidget *widget)
 {
-	LIB3270_TOGGLE id = (LIB3270_TOGGLE) g_object_get_data(G_OBJECT(action),"toggle_id");
+	LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
 	lib3270_trace_event(NULL,"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
 	lib3270_set_toggle(v3270_get_session(widget),id,1);
 }
 
 static void action_reset_toggle(GtkAction *action, GtkWidget *widget)
 {
-	LIB3270_TOGGLE id = (LIB3270_TOGGLE) g_object_get_data(G_OBJECT(action),"toggle_id");
+	LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
 	lib3270_trace_event(NULL,"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
 	lib3270_set_toggle(v3270_get_session(widget),id,0);
 }
@@ -682,7 +684,7 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 		action = GTK_ACTION(gtk_toggle_action_new(nm,NULL,NULL,NULL));
 		if(id < LIB3270_TOGGLE_COUNT)
 			toggle_action[id] = action;
-		g_object_set_data(G_OBJECT(action),"toggle_id",(gpointer) id);
+		g_object_set_data(G_OBJECT(action),"toggle_id",GINT_TO_POINTER(id));
 		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action),(lib3270_get_toggle(v3270_get_session(widget),id) != 0));
 		g_signal_connect(action,"toggled",G_CALLBACK(lib3270_toggle_action),widget);
 		break;
@@ -694,25 +696,25 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 
 	case ACTION_TYPE_PFKEY:
 		action = gtk_action_new(nm,NULL,NULL,NULL);
-		g_object_set_data(G_OBJECT(action),"pfkey",(gpointer) id);
+		g_object_set_data(G_OBJECT(action),"pfkey",GINT_TO_POINTER(id));
 		g_signal_connect(action,"activate",G_CALLBACK(action_pfkey),widget);
 		break;
 
 	case ACTION_TYPE_PAKEY:
 		action = gtk_action_new(nm,NULL,NULL,NULL);
-		g_object_set_data(G_OBJECT(action),"pakey",(gpointer) id);
+		g_object_set_data(G_OBJECT(action),"pakey",GINT_TO_POINTER(id));
 		g_signal_connect(action,"activate",G_CALLBACK(action_pakey),widget);
 		break;
 
 	case ACTION_TYPE_SET:
 		action = gtk_action_new(nm,NULL,NULL,NULL);
-		g_object_set_data(G_OBJECT(action),"toggle_id",(gpointer) id);
+		g_object_set_data(G_OBJECT(action),"toggle_id",GINT_TO_POINTER(id));
 		g_signal_connect(action,"activate",G_CALLBACK(action_set_toggle),widget);
 		break;
 
 	case ACTION_TYPE_RESET:
 		action = gtk_action_new(nm,NULL,NULL,NULL);
-		g_object_set_data(G_OBJECT(action),"toggle_id",(gpointer) id);
+		g_object_set_data(G_OBJECT(action),"toggle_id",GINT_TO_POINTER(id));
 		g_signal_connect(action,"activate",G_CALLBACK(action_reset_toggle),widget);
 		break;
 
diff --git a/src/pw3270/colors.c b/src/pw3270/colors.c
index 18800c9..81ed05c 100644
--- a/src/pw3270/colors.c
+++ b/src/pw3270/colors.c
@@ -177,7 +177,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 	if(colorsel)
 	{
 		// Update color selection widget
-		int	id = (int) g_object_get_data(G_OBJECT(colorsel),"colorid");
+		int	id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(colorsel),"colorid"));
 		if(id >= 0 && id < V3270_COLOR_COUNT)
 			gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel),clr+id);
 	}
@@ -314,7 +314,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
  static void color_changed(GtkColorSelection *colorselection, GtkWidget *widget)
  {
  	GdkColor	clr;
-	int			id		= (int) g_object_get_data(G_OBJECT(colorselection),"colorid");
+	int			id		= GPOINTER_TO_INT(g_object_get_data(G_OBJECT(colorselection),"colorid"));
 
 	if(id < 0 || id >= V3270_COLOR_COUNT)
 		return;
@@ -347,7 +347,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 	if(id < 0 || id >= V3270_COLOR_COUNT)
 		return;
 
-	g_object_set_data(G_OBJECT(color),"colorid",(gpointer) id);
+	g_object_set_data(G_OBJECT(color),"colorid",GINT_TO_POINTER(id));
 	clr = v3270_get_color(widget,id);
 
 	gtk_color_selection_set_previous_color(GTK_COLOR_SELECTION(color),saved+id);
diff --git a/src/pw3270/common/config.c b/src/pw3270/common/config.c
index 4fe2f87..1bfcac4 100644
--- a/src/pw3270/common/config.c
+++ b/src/pw3270/common/config.c
@@ -158,7 +158,7 @@ gchar * get_last_error_msg(void)
 
  gboolean registry_get_double(HKEY hKey, const gchar *key, gdouble *value)
  {
-	GError			* error = NULL;
+//	GError			* error = NULL;
 	BYTE			  data[4096];
 	unsigned long	  datatype;
 	unsigned long	  datalen 	= sizeof(data);
diff --git a/src/pw3270/uiparser/action.c b/src/pw3270/uiparser/action.c
index 94a40fe..1bbf03e 100644
--- a/src/pw3270/uiparser/action.c
+++ b/src/pw3270/uiparser/action.c
@@ -64,7 +64,7 @@
 				return;
 			}
 
-			g_object_set_data(G_OBJECT(action),"id_group",(gpointer) id);
+			g_object_set_data(G_OBJECT(action),"id_group",GINT_TO_POINTER(id));
 
 		}
 		else if(!g_ascii_strcasecmp(name[f],"icon"))
@@ -105,7 +105,7 @@
 		}
 		else if(!g_ascii_strcasecmp(name[f],"id"))
 		{
-			g_object_set_data(G_OBJECT(action),"action_id",(gpointer) atoi(value[f]));
+			g_object_set_data(G_OBJECT(action),"action_id",GINT_TO_POINTER(atoi(value[f])));
 		}
 		else
 		{
diff --git a/src/pw3270/uiparser/parser.c b/src/pw3270/uiparser/parser.c
index 49e14f6..469217e 100644
--- a/src/pw3270/uiparser/parser.c
+++ b/src/pw3270/uiparser/parser.c
@@ -108,7 +108,7 @@ struct action_info
 
 static void action_group_setup(gpointer key, GtkAction *action, struct action_info *info)
 {
-	int group_id = (int) g_object_get_data(G_OBJECT(action),"id_group");
+	int group_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"id_group"));
 
 	gtk_action_set_accel_group(action,info->accel_group);
 
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 4fa3bd9..e5a310a 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -211,8 +211,8 @@
  {
 	if(gtk_check_menu_item_get_active(item))
 	{
-		trace("screen model on widget %p changes to %d",widget,(int) g_object_get_data(G_OBJECT(item),"mode_3270"));
-		lib3270_set_model(v3270_get_session(widget),(int) g_object_get_data(G_OBJECT(item),"mode_3270"));
+		trace("screen model on widget %p changes to %d",widget,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item),"mode_3270")));
+		lib3270_set_model(v3270_get_session(widget),GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item),"mode_3270")));
 	}
  }
 
@@ -234,7 +234,7 @@
 		item = gtk_radio_menu_item_new_with_label(group,name);
 		g_free(name);
 
-		g_object_set_data(G_OBJECT(item),"mode_3270",(gpointer) (f+2));
+		g_object_set_data(G_OBJECT(item),"mode_3270",GINT_TO_POINTER((f+2)));
 
 		group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item));
 
--
libgit2 0.21.2