luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert last 4 commits

Browse Source 
This reverts commits:
  5899c61ed2
  e994d45352
  eb20dec144
  ebec0dd359
which wer accidentally pushed to master instead of a branch
This commit is contained in:
Benjamin Otte
2019-11-26 00:52:03 +01:00
parent 5899c61ed2
commit 276e927fd4
6 changed files with 6 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gobject/gclosure.c
View File

@@ -1258,12 +1258,8 @@ static void
value_from_ffi_type (GValue *gvalue, gpointer *value)
{
ffi_arg *int_val = (ffi_arg*) value;
GType type;
type = G_VALUE_TYPE (gvalue);
restart:
switch (g_type_fundamental (type))
switch (g_type_fundamental (G_VALUE_TYPE (gvalue)))
{
case G_TYPE_INT:
g_value_set_int (gvalue, (gint) *int_val);
@@ -1322,15 +1318,9 @@ restart:
case G_TYPE_VARIANT:
g_value_take_variant (gvalue, *(gpointer*)value);
break;
case G_TYPE_INTERFACE:
type = g_type_interface_instantiable_prerequisite (G_VALUE_TYPE (gvalue));
if (type)
goto restart;
G_GNUC_FALLTHROUGH;
default:
g_warning ("value_from_ffi_type: Unsupported fundamental type %s for type %s",
g_type_name (g_type_fundamental (G_VALUE_TYPE (gvalue))),
g_type_name (G_VALUE_TYPE (gvalue)));
g_warning ("value_from_ffi_type: Unsupported fundamental type: %s",
g_type_name (g_type_fundamental (G_VALUE_TYPE (gvalue))));
}
}