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

GDBus: Don't convert GVariant type 'h' to gint

Browse Source 
The code-generator already uses GVariant* so generated code didn't
really work at all. We want that instead of gint to avoid confusion
because a 'h' instance is an _index_ into a GUnixFDList, not a file
descriptor.

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2011-07-21 09:43:59 -04:00
parent 419bfe325c
commit 03f673abc2
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/gdbusutils.c
View File

@ -421,11 +421,6 @@ g_dbus_gvariant_to_gvalue (GVariant *value,
g_value_set_uint64 (out_gvalue, g_variant_get_uint64 (value)); g_value_set_uint64 (out_gvalue, g_variant_get_uint64 (value));
break; break;
case G_VARIANT_CLASS_HANDLE:
g_value_init (out_gvalue, G_TYPE_INT);
g_value_set_int (out_gvalue, g_variant_get_int32 (value));
break;
case G_VARIANT_CLASS_DOUBLE: case G_VARIANT_CLASS_DOUBLE:
g_value_init (out_gvalue, G_TYPE_DOUBLE); g_value_init (out_gvalue, G_TYPE_DOUBLE);
g_value_set_double (out_gvalue, g_variant_get_double (value)); g_value_set_double (out_gvalue, g_variant_get_double (value));
@ -490,6 +485,7 @@ g_dbus_gvariant_to_gvalue (GVariant *value,
} }
break; break;
case G_VARIANT_CLASS_HANDLE:
case G_VARIANT_CLASS_VARIANT: case G_VARIANT_CLASS_VARIANT:
case G_VARIANT_CLASS_MAYBE: case G_VARIANT_CLASS_MAYBE:
case G_VARIANT_CLASS_TUPLE: case G_VARIANT_CLASS_TUPLE:
@ -552,10 +548,6 @@ g_dbus_gvariant_to_gvalue (GVariant *value,
* <entry><link linkend="G-VARIANT-TYPE-UINT64:CAPS">'t'</link></entry> * <entry><link linkend="G-VARIANT-TYPE-UINT64:CAPS">'t'</link></entry>
* </row> * </row>
* <row> * <row>
* <entry>#G_TYPE_INT</entry>
* <entry><link linkend="G-VARIANT-TYPE-HANDLE:CAPS">'h'</link></entry>
* </row>
* <row>
* <entry>#G_TYPE_DOUBLE</entry> * <entry>#G_TYPE_DOUBLE</entry>
* <entry><link linkend="G-VARIANT-TYPE-DOUBLE:CAPS">'d'</link></entry> * <entry><link linkend="G-VARIANT-TYPE-DOUBLE:CAPS">'d'</link></entry>
* </row> * </row>
@ -644,10 +636,6 @@ g_dbus_gvalue_to_gvariant (const GValue *gvalue,
ret = g_variant_ref_sink (g_variant_new_uint64 (g_value_get_uint64 (gvalue))); ret = g_variant_ref_sink (g_variant_new_uint64 (g_value_get_uint64 (gvalue)));
break; break;
case G_VARIANT_CLASS_HANDLE:
ret = g_variant_ref_sink (g_variant_new_handle (g_value_get_int (gvalue)));
break;
case G_VARIANT_CLASS_DOUBLE: case G_VARIANT_CLASS_DOUBLE:
ret = g_variant_ref_sink (g_variant_new_double (g_value_get_double (gvalue))); ret = g_variant_ref_sink (g_variant_new_double (g_value_get_double (gvalue)));
break; break;
@ -719,7 +707,7 @@ g_dbus_gvalue_to_gvariant (const GValue *gvalue,
} }
break; break;
default: case G_VARIANT_CLASS_HANDLE:
case G_VARIANT_CLASS_VARIANT: case G_VARIANT_CLASS_VARIANT:
case G_VARIANT_CLASS_MAYBE: case G_VARIANT_CLASS_MAYBE:
case G_VARIANT_CLASS_TUPLE: case G_VARIANT_CLASS_TUPLE: