ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mountmgr: Support udisks2 versions that store the uuid as an array.

Browse Source
This commit is contained in:
Alexandre Julliard 2012-09-13 22:37:00 +02:00
parent d28174b765
commit ed8d665f8c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/mountmgr.sys/dbus.c
View File

@ -446,8 +446,11 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess
} }
else if (!strcmp( name, "IdUUID" )) else if (!strcmp( name, "IdUUID" ))
{ {
char *uuid_str; const char *uuid_str;
p_dbus_message_iter_get_basic( &variant, &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 ); guid_ptr = parse_uuid( &guid, uuid_str );
} }
} }