brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autorun: simplify code

Browse Source 
Split autorun conditions into separate logic blocks instead of a single
huge if.

https://bugzilla.gnome.org/show_bug.cgi?id=660595
This commit is contained in:
Cosimo Cecchi 2012-06-19 15:17:07 -04:00
parent 0e3795b2f3
commit ebee01b355
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/autorunManager.js
View File

@ -23,12 +23,14 @@ const AutorunSetting = {
};
// misc utils
function ignoreAutorunForMount(mount) {
function shouldAutorunMount(mount) {
let root = mount.get_root();
let volume = mount.get_volume();
if ((root.is_native() && !isMountRootHidden(root)) &&
(volume && volume.allowAutorun && volume.should_automount()))
if (!volume || !volume.should_automount() || !volume.allowAutorun)
return false;
if (!root.is_native() || isMountRootHidden(root))
return false;
return true;
@ -270,7 +272,7 @@ const AutorunResidentSource = new Lang.Class({
},
addMount: function(mount, apps) {
if (ignoreAutorunForMount(mount))
if (!shouldAutorunMount(mount))
return;
let filtered = this._mounts.filter(function (element) {
@ -448,7 +450,7 @@ const AutorunTransientDispatcher = new Lang.Class({
return;
// if the mount doesn't want to be autorun, return
if (ignoreAutorunForMount(mount))
if (!shouldAutorunMount(mount))
return;
let setting = this._getAutorunSettingForType(contentTypes[0]);