From ea250dd11845d8fdea3d9a8ab9083af43a5aa2c9 Mon Sep 17 00:00:00 2001
From: Angelo Naselli <anaselli@linux.it>
Date: Fri, 29 Aug 2014 15:14:13 +0200
Subject: fixed script name manaproxy (new drakproxy)

---
 extras/desktop/manaproxy.desktop          |  8 +++++++
 extras/polkit/org.mageia.manaproxy.policy | 21 ++++++++++++++++++
 scripts/manaproxy                         | 36 +++++++++++++++++++++++++++++++
 scripts/proxymanager                      | 36 -------------------------------
 4 files changed, 65 insertions(+), 36 deletions(-)
 create mode 100644 extras/desktop/manaproxy.desktop
 create mode 100644 extras/polkit/org.mageia.manaproxy.policy
 create mode 100755 scripts/manaproxy
 delete mode 100755 scripts/proxymanager

diff --git a/extras/desktop/manaproxy.desktop b/extras/desktop/manaproxy.desktop
new file mode 100644
index 00000000..f4c59048
--- /dev/null
+++ b/extras/desktop/manaproxy.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=manaproxy
+Comment=AdminPanel proxy manager
+Exec=pkexec /usr/bin/manauser
+Icon=drakproxy-mdk
+Type=Application
+StartupNotify=true
+Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/polkit/org.mageia.manaproxy.policy b/extras/polkit/org.mageia.manaproxy.policy
new file mode 100644
index 00000000..5c3ede9a
--- /dev/null
+++ b/extras/polkit/org.mageia.manaproxy.policy
@@ -0,0 +1,21 @@
+<?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/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>Mageia.Org</vendor>
+  <vendor_url>http://www.mageia.org</vendor_url>
+
+  <action id="org.mageia.manaproxy.pkexec.run">
+    <description>Allow APanel GUI</description>
+    <message>Authentication is required to run the program manaproxy (user=$(user), program=$(program), command_line=$(command_line))</message>
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/manaproxy</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+</policyconfig>
diff --git a/scripts/manaproxy b/scripts/manaproxy
new file mode 100755
index 00000000..05ea4eb4
--- /dev/null
+++ b/scripts/manaproxy
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+# Copyright 2013 Matteo Pasotti
+#
+# This file is part of proxymanager thus adminpanel
+#
+# proxymanager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# proxymanager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with AdminPanel.  If not, see <http://www.gnu.org/licenses/>.
+use Modern::Perl '2011';
+use autodie;
+use AdminPanel::Module::Proxy;
+
+use yui;
+
+my $wm_icon = "/usr/share/mcc/themes/default/drakproxy-mdk.png"; 
+my $wm_name = "Proxies configuration";
+
+yui::YUI::app()->setApplicationTitle($wm_name);
+yui::YUI::app()->setApplicationIcon($wm_icon);
+
+my $proxyMan = AdminPanel::Module::Proxy->new({
+				icon => $wm_icon,
+				name => $wm_name
+			});
+$proxyMan->start();
+
+1;
diff --git a/scripts/proxymanager b/scripts/proxymanager
deleted file mode 100755
index 05ea4eb4..00000000
--- a/scripts/proxymanager
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-# Copyright 2013 Matteo Pasotti
-#
-# This file is part of proxymanager thus adminpanel
-#
-# proxymanager is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# proxymanager is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with AdminPanel.  If not, see <http://www.gnu.org/licenses/>.
-use Modern::Perl '2011';
-use autodie;
-use AdminPanel::Module::Proxy;
-
-use yui;
-
-my $wm_icon = "/usr/share/mcc/themes/default/drakproxy-mdk.png"; 
-my $wm_name = "Proxies configuration";
-
-yui::YUI::app()->setApplicationTitle($wm_name);
-yui::YUI::app()->setApplicationIcon($wm_icon);
-
-my $proxyMan = AdminPanel::Module::Proxy->new({
-				icon => $wm_icon,
-				name => $wm_name
-			});
-$proxyMan->start();
-
-1;
-- 
cgit v1.2.1