From db64e2c30136673c8fca55178125bd6fcef457ca Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Thu, 14 Feb 2019 17:21:09 -0200
Subject: [PATCH] Fixing more Debian 8 build issues.

---
 src/dialogs/colorscheme.c   |  3 ++-
 src/dialogs/security.c      |  3 ++-
 src/filetransfer/settings.c |  2 +-
 src/include/v3270.h         | 17 -----------------
 src/terminal/widget.c       |  3 ++-
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c
index a2a276c..ed6ec2e 100644
--- a/src/dialogs/colorscheme.c
+++ b/src/dialogs/colorscheme.c
@@ -39,6 +39,7 @@
 
  #include <v3270.h>
  #include <lib3270/log.h>
+ #include <internals.h>
  #include <v3270/colorscheme.h>
  #include "../terminal/marshal.h"
 
@@ -370,7 +371,7 @@
 		if(f)
 			g_string_append_c(str,';');
 
-		v3270_autofree gchar * color = gdk_rgba_to_string(clr+f);
+		g_autofree gchar * color = gdk_rgba_to_string(clr+f);
 		g_string_append_printf(str,"%s",color);
 	}
 
diff --git a/src/dialogs/security.c b/src/dialogs/security.c
index a87ad0f..329c918 100644
--- a/src/dialogs/security.c
+++ b/src/dialogs/security.c
@@ -35,6 +35,7 @@
  #include <gtk/gtk.h>
  #include <libintl.h>
  #include <glib/gi18n.h>
+ #include <internals.h>
 
  #include <v3270.h>
 
@@ -93,7 +94,7 @@
 			2,2
 		);
 
-		v3270_autofree gchar * message = g_strdup_printf("<b>%s</b>",lib3270_get_ssl_state_message(hSession));
+		g_autofree gchar * message = g_strdup_printf("<b>%s</b>",lib3270_get_ssl_state_message(hSession));
 		gtk_grid_attach(
 			grid,
 			label_new(message),
diff --git a/src/filetransfer/settings.c b/src/filetransfer/settings.c
index 5e261f6..d467ced 100644
--- a/src/filetransfer/settings.c
+++ b/src/filetransfer/settings.c
@@ -201,7 +201,7 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) {
 
 static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent *event, GtkWidget *widget)
 {
-	v3270_autofree gchar *filename =
+	g_autofree gchar *filename =
 		v3270_select_file(
 			gtk_widget_get_toplevel(widget),
 			_("Select local file"),
diff --git a/src/include/v3270.h b/src/include/v3270.h
index a23e940..920cba2 100644
--- a/src/include/v3270.h
+++ b/src/include/v3270.h
@@ -39,23 +39,6 @@
  #include <lib3270/popup.h>
  #include <lib3270/filetransfer.h>
 
- #if GLIB_CHECK_VERSION(2,44,0)
-
-	#define v3270_autofree	g_autofree
-
- #else
-
-	// Reference: https://github.com/ImageMagick/glib/blob/master/glib/glib-autocleanups.h
-	static inline void v3270_autoptr_cleanup_generic_gfree(void *p)
-	{
-		void **pp = (void**)p;
-		g_free (*pp);
-	}
-
-	#define v3270_autofree __attribute__((cleanup(v3270_autoptr_cleanup_generic_gfree)))
-
- #endif // GLIB(2,44,0)
-
  G_BEGIN_DECLS
 
  #define GTK_TYPE_V3270				(v3270_get_type ())
diff --git a/src/terminal/widget.c b/src/terminal/widget.c
index 4ecf2e7..b1dbef1 100644
--- a/src/terminal/widget.c
+++ b/src/terminal/widget.c
@@ -34,6 +34,7 @@
  #include <lib3270.h>
  #include <lib3270/log.h>
  #include <lib3270/actions.h>
+ #include <internals.h>
 
  #if GTK_CHECK_VERSION(3,0,0)
 	#include <gdk/gdkkeysyms-compat.h>
@@ -202,7 +203,7 @@ gboolean v3270_query_tooltip(GtkWidget  *widget, gint x, gint y, G_GNUC_UNUSED g
 #ifndef _WIN32
 				gtk_tooltip_set_icon_from_icon_name(tooltip,lib3270_get_ssl_state_icon_name(hSession),GTK_ICON_SIZE_DIALOG);
 #endif
-				v3270_autofree gchar * message =
+				g_autofree gchar * message =
 						g_strdup_printf(
 							"<b>%s</b>\n%s",
 								lib3270_get_ssl_state_message(hSession),
--
libgit2 0.21.2