Download as
Browse Code »

Commit db64e2c30136673c8fca55178125bd6fcef457ca

Authored by Perry Werneck
1 parent f584e5ea
Exists in master and in 1 other branch develop

Fixing more Debian 8 build issues.

Showing 5 changed files with 7 additions and 21 deletions   Show diff stats
src/dialogs/colorscheme.c
  Diff comments   View file @db64e2c
... ... @@ -39,6 +39,7 @@
39 39  
40 40 #include <v3270.h>
41 41 #include <lib3270/log.h>
  42 + #include <internals.h>
42 43 #include <v3270/colorscheme.h>
43 44 #include "../terminal/marshal.h"
44 45  
... ... @@ -370,7 +371,7 @@
370 371 if(f)
371 372 g_string_append_c(str,';');
372 373  
373   - v3270_autofree gchar * color = gdk_rgba_to_string(clr+f);
  374 + g_autofree gchar * color = gdk_rgba_to_string(clr+f);
374 375 g_string_append_printf(str,"%s",color);
375 376 }
376 377  
... ...
src/dialogs/security.c
  Diff comments   View file @db64e2c
... ... @@ -35,6 +35,7 @@
35 35 #include <gtk/gtk.h>
36 36 #include <libintl.h>
37 37 #include <glib/gi18n.h>
  38 + #include <internals.h>
38 39  
39 40 #include <v3270.h>
40 41  
... ... @@ -93,7 +94,7 @@
93 94 2,2
94 95 );
95 96  
96   - v3270_autofree gchar * message = g_strdup_printf("<b>%s</b>",lib3270_get_ssl_state_message(hSession));
  97 + g_autofree gchar * message = g_strdup_printf("<b>%s</b>",lib3270_get_ssl_state_message(hSession));
97 98 gtk_grid_attach(
98 99 grid,
99 100 label_new(message),
... ...
src/filetransfer/settings.c
  Diff comments   View file @db64e2c
... ... @@ -201,7 +201,7 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) {
201 201  
202 202 static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent *event, GtkWidget *widget)
203 203 {
204   - v3270_autofree gchar *filename =
  204 + g_autofree gchar *filename =
205 205 v3270_select_file(
206 206 gtk_widget_get_toplevel(widget),
207 207 _("Select local file"),
... ...
src/include/v3270.h
  Diff comments   View file @db64e2c
... ... @@ -39,23 +39,6 @@
39 39 #include <lib3270/popup.h>
40 40 #include <lib3270/filetransfer.h>
41 41  
42   - #if GLIB_CHECK_VERSION(2,44,0)
43   -
44   - #define v3270_autofree g_autofree
45   -
46   - #else
47   -
48   - // Reference: https://github.com/ImageMagick/glib/blob/master/glib/glib-autocleanups.h
49   - static inline void v3270_autoptr_cleanup_generic_gfree(void *p)
50   - {
51   - void **pp = (void**)p;
52   - g_free (*pp);
53   - }
54   -
55   - #define v3270_autofree __attribute__((cleanup(v3270_autoptr_cleanup_generic_gfree)))
56   -
57   - #endif // GLIB(2,44,0)
58   -
59 42 G_BEGIN_DECLS
60 43  
61 44 #define GTK_TYPE_V3270 (v3270_get_type ())
... ...
src/terminal/widget.c
  Diff comments   View file @db64e2c
... ... @@ -34,6 +34,7 @@
34 34 #include <lib3270.h>
35 35 #include <lib3270/log.h>
36 36 #include <lib3270/actions.h>
  37 + #include <internals.h>
37 38  
38 39 #if GTK_CHECK_VERSION(3,0,0)
39 40 #include <gdk/gdkkeysyms-compat.h>
... ... @@ -202,7 +203,7 @@ gboolean v3270_query_tooltip(GtkWidget *widget, gint x, gint y, G_GNUC_UNUSED g
202 203 #ifndef _WIN32
203 204 gtk_tooltip_set_icon_from_icon_name(tooltip,lib3270_get_ssl_state_icon_name(hSession),GTK_ICON_SIZE_DIALOG);
204 205 #endif
205   - v3270_autofree gchar * message =
  206 + g_autofree gchar * message =
206 207 g_strdup_printf(
207 208 "<b>%s</b>\n%s",
208 209 lib3270_get_ssl_state_message(hSession),
... ...