Merge branch 'master' of vparabola:abslibre

Conflicts:
	pcr/pandoc/PKGBUILD

1 files changed, 10 insertions, 9 deletions

diff --git a/libre/xbmc-libre/polkit.rules b/libre/xbmc-libre/polkit.rules
index 5bc7e69f5..4b6d0fda0 100644
--- a/libre/xbmc-libre/polkit.rules
+++ b/libre/xbmc-libre/polkit.rules
@@ -1,11 +1,12 @@
 polkit.addRule(function(action, subject) {
-  if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) {
-    return polkit.Result.YES;
-  }
-});
-
-polkit.addRule(function(action, subject) {
-  if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) {
-    return polkit.Result.YES;
-  }
+    if (subject.user == "xbmc") {
+        polkit.log("action=" + action);
+        polkit.log("subject=" + subject);
+        if (action.id.indexOf("org.freedesktop.login1.") == 0) {
+            return polkit.Result.YES;
+        }
+        if (action.id.indexOf("org.freedesktop.udisks.") == 0) {
+            return polkit.Result.YES;
+        }
+    }
 });