summaryrefslogtreecommitdiff
path: root/dbus/dbus-marshal-basic.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-03-10 19:07:15 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-03-10 19:07:15 +0000
commit8299a41aa6808f020907b17bf3a66d9f360305be (patch)
treebc33b3450045829078cf172656e0ad175c98f964 /dbus/dbus-marshal-basic.c
parent9759973233122ecf121a1d9522f95414f0fa7493 (diff)
parentd1d395774435d7759ef2b2af337222da79bc7264 (diff)
downloaddbus-8299a41aa6808f020907b17bf3a66d9f360305be.tar.gz
Merge branch 'dbus-1.4'
Diffstat (limited to 'dbus/dbus-marshal-basic.c')
-rw-r--r--dbus/dbus-marshal-basic.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c
index ea18dbf3..3cbc7216 100644
--- a/dbus/dbus-marshal-basic.c
+++ b/dbus/dbus-marshal-basic.c
@@ -1065,8 +1065,6 @@ _dbus_marshal_write_fixed_multi (DBusString *str,
case DBUS_TYPE_INT16:
case DBUS_TYPE_UINT16:
return marshal_fixed_multi (str, insert_at, vp, n_elements, byte_order, 2, pos_after);
- /* FIXME: we canonicalize to 0 or 1 for the single boolean case
- * should we here too ? */
case DBUS_TYPE_BOOLEAN:
case DBUS_TYPE_INT32:
case DBUS_TYPE_UINT32: