Merge lp:~vikoadi/pantheon-files/administrator-pkexec into lp:~elementary-apps/pantheon-files/trunk

[Viko Adi Rahmawan]

* add pantheon-files-pkexec wrapper for pkexec pantheon-files
* add pantheon-files .policy for polkit authentication
* call pantheon-files-pkexec instead off gksu from .desktop

* add pantheon-files-pkexec wrapper for pkexec pantheon-files
* add pantheon-files .policy for polkit authentication
* call pantheon-files-pkexec instead off gksu from .desktop

[Danielle Foré (danrabbit)]

Works here!

review: Approve (ux)

[David Gomes (davidgomes)]

Approving pkexec usage (code).

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-08-05 18:42:18 +0000
+++ data/CMakeLists.txt	2014-09-23 15:28:57 +0000
@@ -1,6 +1,10 @@
 configure_file(pantheon-files.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.desktop)
 configure_file(pantheon-files.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service)
+configure_file(pantheon-files-pkexec.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec)
+configure_file(net.launchpad.pantheon-files.policy.cmake ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.desktop DESTINATION share/applications)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service DESTINATION share/dbus-1/services/)
+install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec DESTINATION bin)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy DESTINATION share/polkit-1/actions/)
 add_subdirectory (icons)
-add_subdirectory (schemas)
+add_subdirectory (schemas)
\ No newline at end of file

=== added file 'data/net.launchpad.pantheon-files.policy.cmake'
--- data/net.launchpad.pantheon-files.policy.cmake	1970-01-01 00:00:00 +0000
+++ data/net.launchpad.pantheon-files.policy.cmake	2014-09-23 15:28:57 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+<policyconfig>
+  <vendor>elementary</vendor>
+  <vendor_url>http://launchpad.net/pantheon-files</vendor_url>
+  <icon_name>system-file-manager</icon_name>
+  <action id="org.freedesktop.policykit.pkexec.pantheon-files">
+   <description>Run Pantheon Files as Administrator</description>
+   <message>Authentication is required to run Files as Administrator</message>
+   <defaults>
+     <allow_any>auth_admin</allow_any>
+     <allow_inactive>auth_admin</allow_inactive>
+     <allow_active>auth_admin</allow_active>
+   </defaults>
+     <annotate key="org.freedesktop.policykit.exec.path">@CMAKE_INSTALL_PREFIX@/bin/pantheon-files</annotate>
+     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+   </action>  
+</policyconfig>
\ No newline at end of file

=== added file 'data/pantheon-files-pkexec.cmake'
--- data/pantheon-files-pkexec.cmake	1970-01-01 00:00:00 +0000
+++ data/pantheon-files-pkexec.cmake	2014-09-23 15:28:57 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "@CMAKE_INSTALL_PREFIX@/bin/pantheon-files"
\ No newline at end of file

=== modified file 'data/pantheon-files.desktop.in'
--- data/pantheon-files.desktop.in	2014-05-26 10:35:33 +0000
+++ data/pantheon-files.desktop.in	2014-09-23 15:28:57 +0000
@@ -26,10 +26,10 @@
 
 [Root Shortcut Group]
 Name=New Window As _Administrator
-Exec=gksu pantheon-files
+Exec=pantheon-files-pkexec
 TargetEnvironment=Unity
 
 [AboutDialog Shortcut Group]
 Name=About _Files
 Exec=pantheon-files --about
-TargetEnvironment=Unity
+TargetEnvironment=Unity
\ No newline at end of file