From a24326c06b4df98e2d9fa5105ea92c90b57a250d Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Mon, 28 Jan 2013 22:15:56 -0700 Subject: [PATCH] gtk: Remove deprecated functions: g_value_get_char, g_thread_init... --- src/gtk/Includes/gobject/gvaluetypes.cdecl | 6 +++--- src/gtk/gobject.scm | 4 ++-- src/gtk/gtkio.c.stay | 8 -------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/gtk/Includes/gobject/gvaluetypes.cdecl b/src/gtk/Includes/gobject/gvaluetypes.cdecl index cf10e2a10..6f2b5e1ed 100644 --- a/src/gtk/Includes/gobject/gvaluetypes.cdecl +++ b/src/gtk/Includes/gobject/gvaluetypes.cdecl @@ -4,10 +4,10 @@ glib-2.0/gobject/gvaluetypes.h |# (include "gvalue") -(extern void g_value_set_char +(extern void g_value_set_schar (value (* GValue)) - (v_char gchar)) -(extern gchar g_value_get_char + (v_char gint8)) +(extern gint8 g_value_get_schar (value (* (const GValue)))) (extern void g_value_set_uchar (value (* GValue)) diff --git a/src/gtk/gobject.scm b/src/gtk/gobject.scm index 6ab1af590..24a4adbc8 100644 --- a/src/gtk/gobject.scm +++ b/src/gtk/gobject.scm @@ -224,7 +224,7 @@ USA. ((int:= type (C-enum "G_TYPE_INTERFACE")) (unimplemented "an interface")) ((int:= type (C-enum "G_TYPE_CHAR")) - (C-call "g_value_get_char" gvalue)) + (C-call "g_value_get_schar" gvalue)) ((int:= type (C-enum "G_TYPE_UCHAR")) (C-call "g_value_get_uchar" gvalue)) ((int:= type (C-enum "G_TYPE_BOOLEAN")) @@ -299,7 +299,7 @@ USA. (let ((fundamental (C-call "G_TYPE_FUNDAMENTAL" gtype))) (cond ((int:= fundamental (C-enum "G_TYPE_CHAR")) - (C-call "g_value_set_char" + (C-call "g_value_set_schar" gvalue (check-prop-char value name))) ((int:= fundamental (C-enum "G_TYPE_UCHAR")) (C-call "g_value_set_uchar" diff --git a/src/gtk/gtkio.c.stay b/src/gtk/gtkio.c.stay index 1b16ffc3e..42b67ce77 100644 --- a/src/gtk/gtkio.c.stay +++ b/src/gtk/gtkio.c.stay @@ -280,13 +280,9 @@ scheme_source_dispatch (GSource * source, gboolean ret = FALSE; - gdk_threads_enter (); - if (!g_source_is_destroyed (source)) ret = do_scheme (source); - gdk_threads_leave (); - return ret; } @@ -387,9 +383,6 @@ start_gtk (int *argc, char ***argv) return (initted); init_signal_handling (); - g_thread_init (NULL); - gdk_threads_init (); - gdk_threads_enter (); if (gtk_init_check (argc, argv)) { initted = TRUE; @@ -408,7 +401,6 @@ start_gtk (int *argc, char ***argv) gtk_main (); destroy_scheme_source (); } - gdk_threads_leave (); return initted; } -- 2.25.1