mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Setting options to UDisks unmount.

Browse source
This commit is contained in:
cobines 2010-12-30 02:09:49 +00:00
commit d4b71fffa7
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/platform/unix/ushellcontextmenu.pas
View file

@ -219,7 +219,7 @@ var
begin
if uUDisks.Initialize then
begin
Succeeded := uUDisks.Unmount(DeviceFileToUDisksObjectPath(FDrive.DeviceId), '');
Succeeded := uUDisks.Unmount(DeviceFileToUDisksObjectPath(FDrive.DeviceId), nil);
uUDisks.Finalize;
end;

28
src/platform/unix/uudisks.pas
View file

@ -80,7 +80,7 @@ function GetObjectProperty(const ObjectPath: UTF8String;
function GetDeviceInfo(const ObjectPath: UTF8String; out Info: TUDisksDeviceInfo): Boolean;
function EnumerateDevices(out DevicesList: TStringArray): Boolean;
function EnumerateDevices(out DevicesInfos: TUDisksDevicesInfos): Boolean;
function Unmount(const ObjectPath: UTF8String; const Options: UTF8String): Boolean;
function Unmount(const ObjectPath: UTF8String; const Options: TStringArray): Boolean;
function Initialize: Boolean;
procedure Finalize;
procedure DispatchMessages;
@ -505,11 +505,12 @@ begin
end;
end;
function Unmount(const ObjectPath: UTF8String; const Options: UTF8String): Boolean;
function Unmount(const ObjectPath: UTF8String; const Options: TStringArray): Boolean;
var
message, reply: PDBusMessage;
argsIter, arrayIter: DBusMessageIter;
optsPChar: PChar;
i: Integer;
begin
message := dbus_message_new_method_call(UDisksAddress,
PChar(ObjectPath),
@ -522,14 +523,27 @@ begin
end
else
begin
optsPChar := PChar(Options);
dbus_message_iter_init_append(message, @argsIter);
if (dbus_message_iter_open_container(@argsIter, DBUS_TYPE_ARRAY, PChar('s'), @arrayIter) = 0) or
(dbus_message_iter_append_basic(@arrayIter, DBUS_TYPE_STRING, @optsPChar) = 0) or
(dbus_message_iter_close_container(@argsIter, @arrayIter) = 0) then
Result := dbus_message_iter_open_container(@argsIter, DBUS_TYPE_ARRAY, PChar(DBUS_TYPE_STRING_AS_STRING), @arrayIter) <> 0;
if Result then
begin
for i := Low(Options) to High(Options) do
begin
optsPChar := PChar(Options[i]);
if dbus_message_iter_append_basic(@arrayIter, DBUS_TYPE_STRING, @optsPChar) = 0 then
begin
Result := False;
Break;
end;
end;
if dbus_message_iter_close_container(@argsIter, @arrayIter) = 0 then
Result := False;
end;
if not Result then
begin
Print('Cannot append arguments');
Result := False;
end
else
begin