luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gclosure: add missing fundamental types to generic marshaler

Browse Source 
for GObject type the ffi->gvalue conversion was not handled. The
GFlags type was completely missing.
This commit is contained in:
Xan Lopez 2011-06-09 23:50:22 +02:00
parent b87d9405be
commit 42c2e42a39
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/gclosure.c
View File

@ -30,6 +30,7 @@
#include "gclosure.h" #include "gclosure.h"
#include "gboxed.h" #include "gboxed.h"
#include "genums.h"
#include "gvalue.h" #include "gvalue.h"
#include "gvaluetypes.h" #include "gvaluetypes.h"
@ -957,6 +958,7 @@ value_to_ffi_type (const GValue *gvalue, gpointer *value)
break; break;
case G_TYPE_UCHAR: case G_TYPE_UCHAR:
case G_TYPE_UINT: case G_TYPE_UINT:
case G_TYPE_FLAGS:
rettype = &ffi_type_uint; rettype = &ffi_type_uint;
*value = (gpointer)&(gvalue->data[0].v_uint); *value = (gpointer)&(gvalue->data[0].v_uint);
break; break;
@ -1049,6 +1051,12 @@ value_from_ffi_type (GValue *gvalue, gpointer *value)
case G_TYPE_BOXED: case G_TYPE_BOXED:
g_value_set_boxed (gvalue, *(gpointer*)value); g_value_set_boxed (gvalue, *(gpointer*)value);
break; break;
case G_TYPE_FLAGS:
g_value_set_flags (gvalue, *(guint*)value);
break;
case G_TYPE_OBJECT:
g_value_set_object (gvalue, *(gpointer*)value);
break;
default: default:
g_warning ("value_from_ffi_type: Unsupported fundamental type: %s", g_warning ("value_from_ffi_type: Unsupported fundamental type: %s",
g_type_name (g_type_fundamental (G_VALUE_TYPE (gvalue)))); g_type_name (g_type_fundamental (G_VALUE_TYPE (gvalue))));