VesperOS/gnome-shell-extensions
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup: Share unmount/eject arugments

Browse Source 
Besides the callback, eject and unmount share the same arguments.
Make this explicit by sharing the common arguments between branches.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/60
This commit is contained in:
Florian Müllner
2019-03-02 23:22:42 +01:00
parent fb039c0fb5
commit 1f1f9664a6
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/drive-menu/extension.js
View File

@@ -65,17 +65,17 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
}
_eject() {
let mountOp = new ShellMountOperation.ShellMountOperation(this.mount);
let unmountArgs = [
Gio.MountUnmountFlags.NONE,
(new ShellMountOperation.ShellMountOperation(this.mount)).mountOp,
null // Gio.Cancellable
];
if (this.mount.can_eject())
this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
mountOp.mountOp,
null, // Gio.Cancellable
this.mount.eject_with_operation(...unmountArgs,
this._ejectFinish.bind(this));
else
this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
mountOp.mountOp,
null, // Gio.Cancellable
this.mount.unmount_with_operation(...unmountArgs,
this._unmountFinish.bind(this));
}

14
extensions/places-menu/placeDisplay.js
View File

@@ -183,17 +183,17 @@ class PlaceDeviceInfo extends PlaceInfo {
}
eject() {
let mountOp = new ShellMountOperation.ShellMountOperation(this._mount);
let unmountArgs = [
Gio.MountUnmountFlags.NONE,
(new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
null // Gio.Cancellable
];
if (this._mount.can_eject())
this._mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
mountOp.mountOp,
null, // Gio.Cancellable
this._mount.eject_with_operation(...unmountArgs,
this._ejectFinish.bind(this));
else
this._mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
mountOp.mountOp,
null, // Gio.Cancellable
this._mount.unmount_with_operation(...unmountArgs,
this._unmountFinish.bind(this));
}