Alexandre Julliard : mountmgr: Support udisks2 versions that store the uuid as an array.
Alexandre Julliard
julliard at winehq.org
Fri Sep 14 10:54:20 CDT 2012
Module: wine
Branch: master
Commit: ed8d665f8c04ee70fdc8bb76967d2ad3526bc691
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8d665f8c04ee70fdc8bb76967d2ad3526bc691
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Sep 13 22:37:00 2012 +0200
mountmgr: Support udisks2 versions that store the uuid as an array.
---
dlls/mountmgr.sys/dbus.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c
index ea0341a..0384c29 100644
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -446,8 +446,11 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess
}
else if (!strcmp( name, "IdUUID" ))
{
- char *uuid_str;
- p_dbus_message_iter_get_basic( &variant, &uuid_str );
+ const char *uuid_str;
+ if (p_dbus_message_iter_get_arg_type( &variant ) == DBUS_TYPE_ARRAY)
+ uuid_str = udisks2_string_from_array( &variant );
+ else
+ p_dbus_message_iter_get_basic( &variant, &uuid_str );
guid_ptr = parse_uuid( &guid, uuid_str );
}
}
More information about the wine-cvs
mailing list