diff options
| author | Michael Meeks <michael@ximian.com> | 2004-05-28 13:10:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@ximian.com> | 2004-05-28 13:10:36 +0000 |
| commit | 0123e6a927772af6d56ddbe3f75a443ab40646d1 (patch) | |
| tree | 1c31412a2a31d036a0051d364203f7a24ac8be0e /glib | |
| parent | f33553eae306f4864a0198c5f9c56f1059536cf3 (diff) | |
2004-05-28 Michael Meeks <michael@ximian.com>
* glib/dbus-gvalue.c (dbus_gvalue_marshal, dbus_gvalue_demarshal):
fix no int64 case.
* dbus/dbus-string.c (_dbus_string_parse_basic_type): impl.
* dbus/dbus-message.c (_dbus_message_iter_get_basic_type),
(_dbus_message_iter_get_basic_type_array): impl.
drastically simplify ~all relevant _get methods to use these.
(_dbus_message_iter_append_basic_array),
(dbus_message_iter_append_basic): impl
drastically simplify ~all relevant _append methods to use these.
* dbus/dbus-message-builder.c (parse_basic_type)
(parse_basic_array, lookup_basic_type): impl.
(_dbus_message_data_load): prune scads of duplicate /
cut & paste coding.
* dbus/dbus-marshal.c (_dbus_demarshal_basic_type_array)
(_dbus_demarshal_basic_type): implement,
(demarshal_and_validate_len/arg): beef up debug.
(_dbus_marshal_basic_type, _dbus_marshal_basic_type_array): impl.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/dbus-gvalue.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/glib/dbus-gvalue.c b/glib/dbus-gvalue.c index 06bf2182..04e962fe 100644 --- a/glib/dbus-gvalue.c +++ b/glib/dbus-gvalue.c @@ -17,8 +17,10 @@ dbus_gvalue_demarshal (DBusMessageIter *iter, GValue *value) MAP(TYPE_BOOLEAN, get_boolean, TYPE_BOOLEAN , set_boolean); MAP(TYPE_INT32, get_int32, TYPE_INT , set_int); MAP(TYPE_UINT32, get_uint32, TYPE_UINT , set_uint); +#ifdef DBUS_HAVE_INT64 MAP(TYPE_INT64, get_int64, TYPE_INT64 , set_int64); MAP(TYPE_UINT64, get_uint64, TYPE_UINT64 , set_uint64); +#endif MAP(TYPE_DOUBLE, get_double, TYPE_DOUBLE , set_double); case DBUS_TYPE_STRING: { @@ -82,6 +84,7 @@ dbus_gvalue_marshal (DBusMessageIter *iter, GValue *value) dbus_message_iter_append_uint32 (iter, g_value_get_ulong (value)); break; +#ifdef DBUS_HAVE_INT64 case G_TYPE_INT64: dbus_message_iter_append_int64 (iter, g_value_get_int64 (value)); @@ -90,6 +93,7 @@ dbus_gvalue_marshal (DBusMessageIter *iter, GValue *value) dbus_message_iter_append_uint64 (iter, g_value_get_uint64 (value)); break; +#endif case G_TYPE_FLOAT: dbus_message_iter_append_double (iter, g_value_get_float (value)); |