chore: 修改polikit中actiond的风格

修改polikit中actiond的风格

Makefile

@@ -133,7 +133,7 @@ translate: $(addsuffix /LC_MESSAGES/dde-daemon.mo, $(addprefix out/locale/, ${LA
 pot:
 	deepin-update-pot misc/po/locale_config.ini
 
-POLICIES=accounts1 Grub2 Fprintd1
+POLICIES=accounts grub2 fprintd
 ts:
 	for i in $(POLICIES); do \
 		deepin-policy-ts-convert policy2ts misc/polkit-action/org.deepin.dde.$$i.policy.in misc/ts/org.deepin.dde.$$i.policy; \

bin/dde-system-daemon/wallpaper.go

@@ -28,7 +28,7 @@ const maxSize = 32 * 1024 * 1024
 const wallPaperDir = "/usr/share/wallpapers/custom-wallpapers/"
 const solidWallPaperPath = "/usr/share/wallpapers/custom-solidwallpapers/"
 const solidPrefix = "solid::"
-const polkitActionUserAdministration = "org.deepin.dde.accounts1.user-administration"
+const polkitActionUserAdministration = "org.deepin.dde.accounts.user-administration"
 
 var wallPaperDirs = []string{
 	wallPaperDir,

fprintd1/device.go

@@ -16,8 +16,8 @@ import (
 )
 
 const (
-	actionIdEnroll = "org.deepin.dde.fprintd1.enroll"
-	actionIdDelete = "org.deepin.dde.fprintd1.delete-enrolled-fingers"
+	actionIdEnroll = "org.deepin.dde.fprintd.enroll"
+	actionIdDelete = "org.deepin.dde.fprintd.delete-enrolled-fingers"
 )
 
 type IDevice interface {

grub2/grub2_ifc.go

@@ -20,7 +20,7 @@ const (
 	dbusPath        = "/org/deepin/dde/Grub2"
 	dbusInterface   = dbusServiceName
 
-	polikitActionIdCommon               = "org.deepin.dde.Grub2"
+	polikitActionIdCommon               = "org.deepin.dde.grub2"
 	polikitActionIdPrepareGfxmodeDetect = "org.deepin.dde.grub2.prepare-gfxmode-detect"
 
 	timeoutMax = 10

misc/polkit-action/org.deepin.dde.accounts1.policy.in → misc/polkit-action/org.deepin.dde.accounts.policy.in

@@ -6,7 +6,7 @@
     <vendor/>
     <vendor_url/>
 
-    <action id="org.deepin.dde.accounts1.change-own-user-data">
+    <action id="org.deepin.dde.accounts.change-own-user-data">
         <description>Change your own user data</description>
         <message>Authentication is required to change your own user data</message>
         <defaults>
@@ -16,7 +16,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.user-administration">
+    <action id="org.deepin.dde.accounts.user-administration">
         <description>Manage user accounts</description>
         <message>Authentication is required to change user data</message>
         <defaults>
@@ -26,7 +26,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.enable-auto-login">
+    <action id="org.deepin.dde.accounts.enable-auto-login">
         <description>Enable Auto Login</description>
         <message>Authentication is required to enable auto login</message>
         <defaults>
@@ -36,7 +36,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.disable-auto-login">
+    <action id="org.deepin.dde.accounts.disable-auto-login">
         <description>Disable Auto Login</description>
         <message>Authentication is required to disable auto login</message>
         <defaults>
@@ -46,7 +46,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.enable-quick-login">
+    <action id="org.deepin.dde.accounts.enable-quick-login">
         <description>Enable Quick Login</description>
         <message>Authentication is required to enable quick login</message>
         <defaults>
@@ -56,7 +56,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.disable-quick-login">
+    <action id="org.deepin.dde.accounts.disable-quick-login">
         <description>Disable Quick Login</description>
         <message>Authentication is required to disable quick login</message>
         <defaults>
@@ -66,7 +66,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.enable-wechat-auth">
+    <action id="org.deepin.dde.accounts.enable-wechat-auth">
         <description>Enable WeChat Code Login</description>
         <message>Authentication is required to enable WeChat code login</message>
         <defaults>
@@ -76,7 +76,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.disable-wechat-auth">
+    <action id="org.deepin.dde.accounts.disable-wechat-auth">
         <description>Disable WeChat Code Login</description>
         <message>Authentication is required to disable WeChat code login</message>
         <defaults>
@@ -86,7 +86,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.enable-nopass-login">
+    <action id="org.deepin.dde.accounts.enable-nopass-login">
         <description>Enable Login without password</description>
         <message>Authentication is required to enable login without password</message>
         <defaults>
@@ -96,7 +96,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.disable-nopass-login">
+    <action id="org.deepin.dde.accounts.disable-nopass-login">
         <description>Disable Login without password</description>
         <message>Authentication is required to disable login without password</message>
         <defaults>
@@ -106,7 +106,7 @@
         </defaults>
     </action>
 
-    <action id="org.deepin.dde.accounts1.set-keyboard-layout">
+    <action id="org.deepin.dde.accounts.set-keyboard-layout">
         <description>Set keyboard layout</description>
         <message>Authentication is required to set keyboard layout</message>
         <defaults>

misc/polkit-action/org.deepin.dde.airplane.policy

@@ -0,0 +1,19 @@
+<?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>LinuxDeepin</vendor>
+  <vendor_url>https://www.deepin.com/</vendor_url>
+
+  <action id="org.deepin.dde.airplane-mode.enable-disable-any">
+    <description>Enable or disable any switch in airplane mode</description>
+    <message>Authentication is required to enable or disable any switch in airplane mode</message>
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+</policyconfig>

misc/polkit-action/org.deepin.dde.Fprintd1.policy.in → misc/polkit-action/org.deepin.dde.fprintd.policy.in

@@ -4,7 +4,7 @@
 <policyconfig>
 	<vendor>LinuxDeepin</vendor>
 	<vendor_url>https://www.deepin.com/</vendor_url>
-	<action id="org.deepin.dde.fprintd1.enroll">
+	<action id="org.deepin.dde.fprintd.enroll">
 		<description>Add fingerprint password</description>
 		<message>Authentication is required to add fingerprint password</message>
 		<defaults>
@@ -13,7 +13,7 @@
 			<allow_active>auth_admin_keep</allow_active>
 		</defaults>
 	</action>
-	<action id="org.deepin.dde.fprintd1.delete-enrolled-fingers">
+	<action id="org.deepin.dde.fprintd.delete-enrolled-fingers">
 		<description>Clear fingerprint passwords</description>
 		<message>Authentication is required to clear fingerprint passwords</message>
 		<defaults>
@@ -22,7 +22,7 @@
 			<allow_active>auth_admin_keep</allow_active>
 		</defaults>
 	</action>
-	<action id="org.deepin.dde.fprintd1.rename-enrolled-finger">
+	<action id="org.deepin.dde.fprintd.rename-enrolled-finger">
 		<description>Rename fingerprint password</description>
 		<message>Authentication is required to rename fingerprint password</message>
 		<defaults>
@@ -31,7 +31,7 @@
 			<allow_active>auth_admin_keep</allow_active>
 		</defaults>
 	</action>
-	<action id="org.deepin.dde.fprintd1.manager">
+	<action id="org.deepin.dde.fprintd.manager">
 		<description>Manage fingerprint passwords</description>
 		<message>Password is required to perform this action</message>
 		<defaults>

misc/polkit-action/org.deepin.dde.Grub2.policy.in → misc/polkit-action/org.deepin.dde.grub2.policy.in

@@ -6,7 +6,7 @@
   <vendor>LinuxDeepin</vendor>
   <vendor_url>https://www.deepin.com/</vendor_url>
 
-  <action id="org.deepin.dde.Grub2">
+  <action id="org.deepin.dde.grub2">
     <description>Change the grub configuration</description>
     <message>Authentication is required to change the grub configuration</message>
     <defaults>

misc/ts/org.deepin.dde.accounts1.policy/policy.ts → misc/ts/org.deepin.dde.accounts.policy/policy.ts

@@ -2,112 +2,112 @@
 	<context>
 		<name>policy</name>
 		<message>
-			<location filename="org.deepin.dde.accounts1.change-own-user-data!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.change-own-user-data!message" line="0"/>
 			<source>Authentication is required to change your own user data</source>
 			<translation>Authentication is required to change your own user data</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.change-own-user-data!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.change-own-user-data!description" line="0"/>
 			<source>Change your own user data</source>
 			<translation>Change your own user data</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.user-administration!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.user-administration!message" line="0"/>
 			<source>Authentication is required to change user data</source>
 			<translation>Authentication is required to change user data</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.user-administration!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.user-administration!description" line="0"/>
 			<source>Manage user accounts</source>
 			<translation>Manage user accounts</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.enable-auto-login!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.enable-auto-login!message" line="0"/>
 			<source>Authentication is required to enable auto login</source>
 			<translation>Authentication is required to enable auto login</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.enable-auto-login!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.enable-auto-login!description" line="0"/>
 			<source>Enable Auto Login</source>
 			<translation>Enable Auto Login</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.disable-auto-login!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.disable-auto-login!message" line="0"/>
 			<source>Authentication is required to disable auto login</source>
 			<translation>Authentication is required to disable auto login</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.disable-auto-login!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.disable-auto-login!description" line="0"/>
 			<source>Disable Auto Login</source>
 			<translation>Disable Auto Login</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.enable-quick-login!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.enable-quick-login!message" line="0"/>
 			<source>Authentication is required to enable quick login</source>
 			<translation>Authentication is required to enable quick login</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.enable-quick-login!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.enable-quick-login!description" line="0"/>
 			<source>Enable Quick Login</source>
 			<translation>Enable Quick Login</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.disable-quick-login!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.disable-quick-login!message" line="0"/>
 			<source>Authentication is required to disable quick login</source>
 			<translation>Authentication is required to disable quick login</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.disable-quick-login!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.disable-quick-login!description" line="0"/>
 			<source>Disable Quick Login</source>
 			<translation>Disable Quick Login</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.enable-wechat-auth!message" line="0" />
+			<location filename="org.deepin.dde.accounts.enable-wechat-auth!message" line="0" />
 			<source>Authentication is required to enable WeChat code login</source>
 			<translation type="unfinished" />
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.enable-wechat-auth!description" line="0" />
+			<location filename="org.deepin.dde.accounts.enable-wechat-auth!description" line="0" />
 			<source>Enable WeChat Code Login</source>
 			<translation type="unfinished" />
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.disable-wechat-auth!message" line="0" />
+			<location filename="org.deepin.dde.accounts.disable-wechat-auth!message" line="0" />
 			<source>Authentication is required to disable WeChat code login</source>
 			<translation type="unfinished" />
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.disable-wechat-auth!description" line="0" />
+			<location filename="org.deepin.dde.accounts.disable-wechat-auth!description" line="0" />
 			<source>Disable WeChat Code Login</source>
 			<translation type="unfinished" />
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.enable-nopass-login!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.enable-nopass-login!message" line="0"/>
 			<source>Authentication is required to enable login without password</source>
 			<translation>Authentication is required to enable login without password</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.enable-nopass-login!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.enable-nopass-login!description" line="0"/>
 			<source>Enable Login without password</source>
 			<translation>Enable Login without password</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.disable-nopass-login!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.disable-nopass-login!message" line="0"/>
 			<source>Authentication is required to disable login without password</source>
 			<translation>Authentication is required to disable login without password</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.disable-nopass-login!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.disable-nopass-login!description" line="0"/>
 			<source>Disable Login without password</source>
 			<translation>Disable Login without password</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.set-keyboard-layout!message" line="0"/>
+			<location filename="org.deepin.dde.accounts.set-keyboard-layout!message" line="0"/>
 			<source>Authentication is required to set keyboard layout</source>
 			<translation>Authentication is required to set keyboard layout</translation>
 		</message>
 		<message>
-			<location filename="org.deepin.dde.accounts1.set-keyboard-layout!description" line="0"/>
+			<location filename="org.deepin.dde.accounts.set-keyboard-layout!description" line="0"/>
 			<source>Set keyboard layout</source>
 			<translation>Set keyboard layout</translation>
 		</message>