diff options
| author | Vincent Untz <vuntz@novell.com> | 2008-11-21 00:04:53 +0100 |
|---|---|---|
| committer | Vincent Untz <vuntz@novell.com> | 2008-11-21 00:04:53 +0100 |
| commit | f7efa993f16e2b5ba72cf9759a65b2ce2ef66f99 (patch) | |
| tree | 74780f46fdadb5df04a6dbe744e904e91689560b | |
| parent | f7554181d51e911e1b357934853c4d860667048a (diff) | |
Rename policies with dashes, and add class-edit.
| -rw-r--r-- | src/cups-pk-helper-mechanism.c | 8 | ||||
| -rw-r--r-- | src/org.opensuse.cupspkhelper.mechanism.policy.in | 21 |
2 files changed, 19 insertions, 10 deletions
diff --git a/src/cups-pk-helper-mechanism.c b/src/cups-pk-helper-mechanism.c index 8d4505a..e96d35e 100644 --- a/src/cups-pk-helper-mechanism.c +++ b/src/cups-pk-helper-mechanism.c @@ -809,7 +809,7 @@ cph_mechanism_printer_set_default (CphMechanism *mechanism, reset_killtimer (mechanism); if (!_check_polkit_for_action_v (mechanism, context, - "printeraddremove", "printerdefault", + "printeraddremove", "printer-default", NULL)) return FALSE; @@ -830,7 +830,7 @@ cph_mechanism_printer_set_enabled (CphMechanism *mechanism, reset_killtimer (mechanism); if (!_check_polkit_for_action_v (mechanism, context, - "printeraddremove", "printerenable", + "printeraddremove", "printer-enable", NULL)) return FALSE; @@ -873,7 +873,7 @@ cph_mechanism_server_get_settings (CphMechanism *mechanism, reset_killtimer (mechanism); - if (!_check_polkit_for_action (mechanism, context, "serversettings")) + if (!_check_polkit_for_action (mechanism, context, "server-settings")) return FALSE; settings = cph_cups_server_get_settings (mechanism->priv->cups); @@ -892,7 +892,7 @@ cph_mechanism_server_set_settings (CphMechanism *mechanism, reset_killtimer (mechanism); - if (!_check_polkit_for_action (mechanism, context, "serversettings")) + if (!_check_polkit_for_action (mechanism, context, "server-settings")) return FALSE; ret = cph_cups_server_set_settings (mechanism->priv->cups, settings); diff --git a/src/org.opensuse.cupspkhelper.mechanism.policy.in b/src/org.opensuse.cupspkhelper.mechanism.policy.in index 0c3c876..173a8db 100644 --- a/src/org.opensuse.cupspkhelper.mechanism.policy.in +++ b/src/org.opensuse.cupspkhelper.mechanism.policy.in @@ -8,7 +8,7 @@ <vendor_url>http://www.opensuse.org/</vendor_url> <icon_name>printer</icon_name> - <action id="org.opensuse.cupspkhelper.mechanism.printerdefault"> + <action id="org.opensuse.cupspkhelper.mechanism.printer-set-default"> <_description>Set a printer as default printer</_description> <_message>Privileges are required to set a printer, or a class, as default printer.</_message> <defaults> @@ -17,7 +17,7 @@ </defaults> </action> - <action id="org.opensuse.cupspkhelper.mechanism.printerenable"> + <action id="org.opensuse.cupspkhelper.mechanism.printer-enable"> <_description>Enable/Disable a printer</_description> <_message>Privileges are required to enable/disable a printer, or a class.</_message> <defaults> @@ -26,16 +26,16 @@ </defaults> </action> - <action id="org.opensuse.cupspkhelper.mechanism.printerlocal"> + <action id="org.opensuse.cupspkhelper.mechanism.printer-local-edit"> <_description>Add/Remove/Edit a local printer</_description> - <_message>Privileges are required to add/remove/edit a local printer, or a class.</_message> + <_message>Privileges are required to add/remove/edit a local printer.</_message> <defaults> <allow_inactive>no</allow_inactive> <allow_active>auth_admin</allow_active> </defaults> </action> - <action id="org.opensuse.cupspkhelper.mechanism.printerremote"> + <action id="org.opensuse.cupspkhelper.mechanism.printer-remote-edit"> <_description>Add/Remove/Edit a remote printer</_description> <_message>Privileges are required to add/remove/edit a remote printer.</_message> <defaults> @@ -44,7 +44,16 @@ </defaults> </action> - <action id="org.opensuse.cupspkhelper.mechanism.serversettings"> + <action id="org.opensuse.cupspkhelper.mechanism.class-edit"> + <_description>Add/Remove/Edit a class</_description> + <_message>Privileges are required to add/remove/edit a class.</_message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> + </action> + + <action id="org.opensuse.cupspkhelper.mechanism.server-settings"> <_description>Get/Set server settings</_description> <_message>Privileges are required to get/set server settings.</_message> <defaults> |