Rename to udisks - nuke remaining references to Device-disks

Still need to update HACKING and README but the only remaining
references seem to be these

 $ git clean -d -x -f

 $ grep devkit `find data doc po policy src tools`
 doc/man/udisks7.xml:      devkit-devel mailing list,
 doc/man/udisks7.xml:      see <ulink url="http://lists.freedesktop.org/mailman/listinfo/devkit-devel"/>.
 doc/TODO:   - devkit-disk-device.c is way too long right now

 $ grep DeviceKit `find data doc po policy src tools`
 doc/TODO-ISCSI: c) Some thoughts on how to integrate iSCSI into DeviceKit-disks,
 doc/TODO-ISCSI:Teaching DeviceKit-disks / Palimpsest / GNOME about iSCSI devices
 doc/TODO-ISCSI:DeviceKit-disks changes:
 doc/TODO-ISCSI:   the org.freedesktop.DeviceKit.Disks interface add
 doc/TODO-ISCSI:   method on DeviceKit-disks to probe a portal for targets.
 doc/TODO: - DeviceKit 003

 $ grep devicekit `find data doc po policy src tools`

Now to port gnome-disk-utility to use udisks instead of DKD...

diff --git a/data/org.freedesktop.UDisks.Device.xml b/data/org.freedesktop.UDisks.Device.xml
index 6281215..a1df94e 100644 (file)
--- a/data/org.freedesktop.UDisks.Device.xml
+++ b/data/org.freedesktop.UDisks.Device.xml
@@ -71,7 +71,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.cancel-job-others</doc:term>
+              <doc:term>org.freedesktop.udisks.cancel-job-others</doc:term>
               <doc:definition>To cancel a job initiated by another user</doc:definition>
             </doc:item>
           </doc:list>
@@ -136,13 +136,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change</doc:term>
+              <doc:term>org.freedesktop.udisks.change</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.change-system-internal</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">system-internal</doc:ref>
                 device</doc:definition>
@@ -176,13 +176,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change</doc:term>
+              <doc:term>org.freedesktop.udisks.change</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.change-system-internal</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">system-internal</doc:ref>
                 device</doc:definition>
@@ -315,13 +315,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change</doc:term>
+              <doc:term>org.freedesktop.udisks.change</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.change-system-internal</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">system-internal</doc:ref>
                 device</doc:definition>
@@ -375,13 +375,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change</doc:term>
+              <doc:term>org.freedesktop.udisks.change</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.change-system-internal</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:device-is-system-internal">system-internal</doc:ref>
                 device</doc:definition>
@@ -440,13 +440,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change</doc:term>
+              <doc:term>org.freedesktop.udisks.change</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.change-system-internal</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:device-is-system-internal">system-internal</doc:ref>
                 device</doc:definition>
@@ -486,13 +486,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change</doc:term>
+              <doc:term>org.freedesktop.udisks.change</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.change-system-internal</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">system-internal</doc:ref>
                 device</doc:definition>
@@ -538,13 +538,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.filesystem-mount</doc:term>
+              <doc:term>org.freedesktop.udisks.filesystem-mount</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.filesystem-mount-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.filesystem-mount-system-internal</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">system-internal</doc:ref>
                 device</doc:definition>
@@ -583,7 +583,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.filesystem-unmount-others</doc:term>
+              <doc:term>org.freedesktop.udisks.filesystem-unmount-others</doc:term>
               <doc:definition>To unmount a device mounted by another user</doc:definition>
             </doc:item>
           </doc:list>
@@ -621,13 +621,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.filesystem-check</doc:term>
+              <doc:term>org.freedesktop.udisks.filesystem-check</doc:term>
               <doc:definition>To check a file system on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device.</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.filesystem-check-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.filesystem-check-system-internal</doc:term>
               <doc:definition>To check a file system on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">system-internal</doc:ref>
                 device.</doc:definition>
@@ -665,13 +665,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.filesystem-lsof</doc:term>
+              <doc:term>org.freedesktop.udisks.filesystem-lsof</doc:term>
               <doc:definition>To check a file system on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device.</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.filesystem-lsof-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.filesystem-lsof-system-internal</doc:term>
               <doc:definition>To check a file system on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">system-internal</doc:ref>
                 device.</doc:definition>
@@ -710,7 +710,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.luks-unlock</doc:term>
+              <doc:term>org.freedesktop.udisks.luks-unlock</doc:term>
               <doc:definition>To unlock LUKS encrypted devices</doc:definition>
             </doc:item>
           </doc:list>
@@ -745,7 +745,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.luks-lock-others</doc:term>
+              <doc:term>org.freedesktop.udisks.luks-lock-others</doc:term>
               <doc:definition>To lock an encrypted LUKS device unlocked by another user</doc:definition>
             </doc:item>
           </doc:list>
@@ -780,13 +780,13 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change</doc:term>
+              <doc:term>org.freedesktop.udisks.change</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">non-system-internal</doc:ref>
                 device</doc:definition>
             </doc:item>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change-system-internal</doc:term>
+              <doc:term>org.freedesktop.udisks.change-system-internal</doc:term>
               <doc:definition>If the operation is on a
                 <doc:ref type="property" to="Device:DeviceIsSystemInternal">system-internal</doc:ref>
                 device</doc:definition>
@@ -824,7 +824,7 @@
           The caller will need the following PolicyKit authorization:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.linux-md</doc:term>
+              <doc:term>org.freedesktop.udisks.linux-md</doc:term>
               <doc:definition>
                 Needed to configured Linux md Software RAID devices.
               </doc:definition>
@@ -863,7 +863,7 @@
           The caller will need the following PolicyKit authorization:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.linux-md</doc:term>
+              <doc:term>org.freedesktop.udisks.linux-md</doc:term>
               <doc:definition>
                 Needed to configured Linux md Software RAID devices.
               </doc:definition>
@@ -897,7 +897,7 @@
           The caller will need the following PolicyKit authorization:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.linux-md</doc:term>
+              <doc:term>org.freedesktop.udisks.linux-md</doc:term>
               <doc:definition>
                 Needed to configured Linux md Software RAID devices.
               </doc:definition>
@@ -942,7 +942,7 @@
           The caller will need the following PolicyKit authorization:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.linux-md</doc:term>
+              <doc:term>org.freedesktop.udisks.linux-md</doc:term>
               <doc:definition>
                 Needed to configured Linux md Software RAID devices.
               </doc:definition>
@@ -983,7 +983,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.inhibit-polling</doc:term>
+              <doc:term>org.freedesktop.udisks.inhibit-polling</doc:term>
               <doc:definition>To inhibit polling</doc:definition>
             </doc:item>
           </doc:list>
@@ -1037,7 +1037,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.inhibit-polling</doc:term>
+              <doc:term>org.freedesktop.udisks.inhibit-polling</doc:term>
               <doc:definition>To inhibit polling</doc:definition>
             </doc:item>
           </doc:list>
@@ -1066,7 +1066,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.drive-eject</doc:term>
+              <doc:term>org.freedesktop.udisks.drive-eject</doc:term>
               <doc:definition>To eject media from a device</doc:definition>
             </doc:item>
           </doc:list>
@@ -1112,7 +1112,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.drive-detach</doc:term>
+              <doc:term>org.freedesktop.udisks.drive-detach</doc:term>
               <doc:definition>To detach a device</doc:definition>
             </doc:item>
           </doc:list>
@@ -1167,7 +1167,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.drive-set-spindown</doc:term>
+              <doc:term>org.freedesktop.udisks.drive-set-spindown</doc:term>
               <doc:definition>To set spindown timeouts</doc:definition>
             </doc:item>
           </doc:list>
@@ -1202,7 +1202,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.drive-set-spindown</doc:term>
+              <doc:term>org.freedesktop.udisks.drive-set-spindown</doc:term>
               <doc:definition>To set spindown timeouts</doc:definition>
             </doc:item>
           </doc:list>
@@ -1239,7 +1239,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.drive-ata-smart-refresh</doc:term>
+              <doc:term>org.freedesktop.udisks.drive-ata-smart-refresh</doc:term>
               <doc:definition>Needed to refresh ATA SMART data</doc:definition>
             </doc:item>
           </doc:list>
@@ -1278,7 +1278,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.drive-ata-smart-selftest</doc:term>
+              <doc:term>org.freedesktop.udisks.drive-ata-smart-selftest</doc:term>
               <doc:definition>Needed to run ATA SMART self tests</doc:definition>
             </doc:item>
           </doc:list>
@@ -1346,7 +1346,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.change</doc:term>
+              <doc:term>org.freedesktop.udisks.change</doc:term>
               <doc:definition>Needed to run benchmarks</doc:definition>
             </doc:item>
           </doc:list>

diff --git a/data/org.freedesktop.UDisks.xml b/data/org.freedesktop.UDisks.xml
index 5e14cf9..f15a86c 100644 (file)
--- a/data/org.freedesktop.UDisks.xml
+++ b/data/org.freedesktop.UDisks.xml
@@ -168,7 +168,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.inhibit-polling</doc:term>
+              <doc:term>org.freedesktop.udisks.inhibit-polling</doc:term>
               <doc:definition>To inhibit polling</doc:definition>
             </doc:item>
           </doc:list>
@@ -241,7 +241,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.drive-set-spindown</doc:term>
+              <doc:term>org.freedesktop.udisks.drive-set-spindown</doc:term>
               <doc:definition>To set spindown timeouts</doc:definition>
             </doc:item>
           </doc:list>
@@ -276,7 +276,7 @@
           The caller will need one of the following PolicyKit authorizations:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.drive-set-spindown</doc:term>
+              <doc:term>org.freedesktop.udisks.drive-set-spindown</doc:term>
               <doc:definition>To set spindown timeouts</doc:definition>
             </doc:item>
           </doc:list>
@@ -315,7 +315,7 @@
           The caller will need the following PolicyKit authorization:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.linux-md</doc:term>
+              <doc:term>org.freedesktop.udisks.linux-md</doc:term>
               <doc:definition>
                 Needed to configured Linux md Software RAID devices.
               </doc:definition>
@@ -366,7 +366,7 @@
           The caller will need the following PolicyKit authorization:
           <doc:list>
             <doc:item>
-              <doc:term>org.freedesktop.devicekit.disks.linux-md</doc:term>
+              <doc:term>org.freedesktop.udisks.linux-md</doc:term>
               <doc:definition>
                 Needed to configured Linux md Software RAID devices.
               </doc:definition>

diff --git a/data/udisks.pc.in b/data/udisks.pc.in
index b39f9c7..7bdeb10 100644 (file)
--- a/data/udisks.pc.in
+++ b/data/udisks.pc.in
@@ -1,4 +1,4 @@
 
-Name: DeviceKit-disks
-Description: DeviceKit-disks daemon
+Name: udisks
+Description: udisks storage daemon
 Version: @VERSION@

diff --git a/doc/.gitignore b/doc/.gitignore
index 0da2982..50b6a26 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,18 +1,18 @@
 Makefile
 Makefile.in
-devkit-disks-decl-list.txt
-devkit-disks-decl.txt
-devkit-disks-overrides.txt
-devkit-disks-sections.txt
-devkit-disks-undeclared.txt
-devkit-disks-undocumented.txt
-devkit-disks-unused.txt
-devkit-disks.args
-devkit-disks.hierarchy
-devkit-disks.interfaces
-devkit-disks.prerequisites
-devkit-disks.signals
-devkit-disks.types
+udisks-decl-list.txt
+udisks-decl.txt
+udisks-overrides.txt
+udisks-sections.txt
+udisks-undeclared.txt
+udisks-undocumented.txt
+udisks-unused.txt
+udisks.args
+udisks.hierarchy
+udisks.interfaces
+udisks.prerequisites
+udisks.signals
+udisks.types
 html-build.stamp
 html.stamp
 html

diff --git a/doc/dbus/.gitignore b/doc/dbus/.gitignore
index 0e4a23a..cdbb7c5 100644 (file)
--- a/doc/dbus/.gitignore
+++ b/doc/dbus/.gitignore
@@ -1,5 +1,5 @@
 Makefile
 Makefile.in
-org.freedesktop.DeviceKit.Disks.Device.ref.xml
-org.freedesktop.DeviceKit.Disks.ref.xml
+org.freedesktop.UDisks.Device.ref.xml
+org.freedesktop.UDisks.ref.xml
 

diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index 6d29d64..ed8af94 100644 (file)
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -1,6 +1,6 @@
 Makefile
 Makefile.in
-DeviceKit-disks.7
-devkit-disks-daemon.8
-devkit-disks.1
+udisks.7
+udisks-daemon.8
+udisks.1
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 286e689..26f71a6 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,4 +2,4 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 policy/org.freedesktop.udisks.policy.in
-src/devkit-disks-polkit-action-lookup.c
+src/polkit-action-lookup.c

diff --git a/po/da.po b/po/da.po
index 39736ab..bcbda80 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,14 +1,14 @@
-# Danish translations for DeviceKit-disks.
+# Danish translations for udisks.
 # Copyright (C) 2009 Red Hat, Inc.
-# This file is distributed under the same license as the DeviceKit-disks package.
+# This file is distributed under the same license as the udisks package.
 # David Zeuthen <davidz@redhat.com>, 2009.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: DeviceKit-disks\n"
+"Project-Id-Version: udisks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-12 18:09-0400\n"
+"POT-Creation-Date: 2009-12-01 14:36-0500\n"
 "PO-Revision-Date: 2009-05-12 17:01-0400\n"
 "Last-Translator: David Zeuthen <davidz@redhat.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -17,32 +17,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:1
+#: ../policy/org.freedesktop.udisks.policy.in.h:1
 msgid "Authentication is required to cancel a job initiated by another user"
 msgstr ""
 "Autorisering er påkrævet for at afbryde et job påbegyndt af en anden bruger"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:2
+#: ../policy/org.freedesktop.udisks.policy.in.h:2
 msgid "Authentication is required to check the file system on the device"
 msgstr "Autorisering er påkrævet for at checke fil systemet på en enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:3
+#: ../policy/org.freedesktop.udisks.policy.in.h:3
 msgid "Authentication is required to configure Linux Software RAID devices"
 msgstr "Autorisering er påkrævet for at konfigurere RAID enheder"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:4
+#: ../policy/org.freedesktop.udisks.policy.in.h:4
+#, fuzzy
+msgid "Authentication is required to configure drive spindown timeout"
+msgstr "Autorisering er påkrævet for at konfigurere RAID enheder"
+
+#: ../policy/org.freedesktop.udisks.policy.in.h:5
+#, fuzzy
+msgid "Authentication is required to detach the drive"
+msgstr "Autorisering er påkrævet for at montere et fil system"
+
+#: ../policy/org.freedesktop.udisks.policy.in.h:6
 msgid "Authentication is required to eject media from the device"
 msgstr "Autorisering er påkrævet for at skubbe medie ud af en enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:5
+#: ../policy/org.freedesktop.udisks.policy.in.h:7
 msgid "Authentication is required to inhibit media detection"
 msgstr "Autorisering er påkrævet for at undertrykke medie detektion"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:6
+#: ../policy/org.freedesktop.udisks.policy.in.h:8
 msgid "Authentication is required to list open files on a mounted file system"
 msgstr "Autorisering er påkrævet for at liste åbne filer"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:7
+#: ../policy/org.freedesktop.udisks.policy.in.h:9
 msgid ""
 "Authentication is required to lock an encrypted device unlocked by another "
 "user"
@@ -50,167 +60,191 @@ msgstr ""
 "Autorisering er påkrævet for at låse en krypteret enhed åbnet af en anden "
 "bruger"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:8
+#: ../policy/org.freedesktop.udisks.policy.in.h:10
 msgid "Authentication is required to modify the device"
 msgstr "Autorisering er påkrævet for at ændre en enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:9
+#: ../policy/org.freedesktop.udisks.policy.in.h:11
 msgid "Authentication is required to mount the device"
 msgstr "Autorisering er påkrævet for at montere et fil system"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:10
+#: ../policy/org.freedesktop.udisks.policy.in.h:12
 msgid "Authentication is required to refresh ATA SMART data"
 msgstr "Autorisering er påkrævet for at læse ATA SMART data"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:11
+#: ../policy/org.freedesktop.udisks.policy.in.h:13
 msgid "Authentication is required to retrieve historical ATA SMART data"
 msgstr "Autorisering er påkrævet for at hente historisk ATA SMART data"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:12
+#: ../policy/org.freedesktop.udisks.policy.in.h:14
 msgid "Authentication is required to run ATA SMART self tests"
 msgstr "Autorisering er påkrævet for at køre ATA SMART selvcheck"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:13
+#: ../policy/org.freedesktop.udisks.policy.in.h:15
 msgid "Authentication is required to unlock an encrypted device"
 msgstr "Autorisering er påkrævet for at åbne en krypteret enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:14
+#: ../policy/org.freedesktop.udisks.policy.in.h:16
 msgid "Authentication is required to unmount devices mounted by another user"
 msgstr ""
 "Autorisering er påkrævet for at afmontere enheder monteret af en anden bruger"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:15
+#: ../policy/org.freedesktop.udisks.policy.in.h:17
 msgid "Cancel a job initiated by another user"
 msgstr "Afbryd job påbegyndt af en anden bruger"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:16
+#: ../policy/org.freedesktop.udisks.policy.in.h:18
 msgid "Check file system of a system-internal device"
 msgstr "Check fil system for en intern enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:17
+#: ../policy/org.freedesktop.udisks.policy.in.h:19
 msgid "Check file system on a device"
 msgstr "Check fil system for en enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:18
+#: ../policy/org.freedesktop.udisks.policy.in.h:20
 msgid "Configure Linux Software RAID"
 msgstr "Konfigurér Software RAID"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:19
-msgid "Eject a device"
+#: ../policy/org.freedesktop.udisks.policy.in.h:21
+msgid "Detach a drive"
+msgstr ""
+
+#: ../policy/org.freedesktop.udisks.policy.in.h:22
+#, fuzzy
+msgid "Eject media from a device"
 msgstr "Skub media ud af en enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:20
+#: ../policy/org.freedesktop.udisks.policy.in.h:23
 msgid "Inhibit media detection"
 msgstr "Undertryk medie detektion"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:21
+#: ../policy/org.freedesktop.udisks.policy.in.h:24
 msgid "List open files"
 msgstr "Vis åbne filer"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:22
+#: ../policy/org.freedesktop.udisks.policy.in.h:25
 msgid "List open files on a system-internal device"
 msgstr "Vis åbne filer på en intern enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:23
+#: ../policy/org.freedesktop.udisks.policy.in.h:26
 msgid "Lock an encrypted device unlocked by another user"
 msgstr "Lås en krypteret enhed åbnet af en anden bruger"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:24
+#: ../policy/org.freedesktop.udisks.policy.in.h:27
 msgid "Modify a device"
 msgstr "Modificér en enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:25
+#: ../policy/org.freedesktop.udisks.policy.in.h:28
 msgid "Modify a system-internal device"
 msgstr "Modificér en intern enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:26
+#: ../policy/org.freedesktop.udisks.policy.in.h:29
 msgid "Mount a device"
 msgstr "Montér en enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:27
+#: ../policy/org.freedesktop.udisks.policy.in.h:30
 msgid "Mount a system-internal device"
 msgstr "Montér en intern enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:28
+#: ../policy/org.freedesktop.udisks.policy.in.h:31
 msgid "Refresh ATA SMART data"
 msgstr "Læs ATA SMART data"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:29
+#: ../policy/org.freedesktop.udisks.policy.in.h:32
 msgid "Retrieve historical ATA SMART data"
 msgstr "Hent historisk ATA SMART data"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:30
+#: ../policy/org.freedesktop.udisks.policy.in.h:33
 msgid "Run ATA SMART Self Tests"
 msgstr "Kør ATA SMART selv checks"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:31
+#: ../policy/org.freedesktop.udisks.policy.in.h:34
+msgid "Set drive spindown timeout"
+msgstr ""
+
+#: ../policy/org.freedesktop.udisks.policy.in.h:35
 msgid "Unlock an encrypted device"
 msgstr "Åbn en krypteret enhed"
 
-#: ../policy/org.freedesktop.devicekit.disks.policy.in.h:32
+#: ../policy/org.freedesktop.udisks.policy.in.h:36
 msgid "Unmount a device mounted by another user"
 msgstr "Afmontér en enhed monteret af en anden bruger"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:94
+#: ../src/polkit-action-lookup.c:94
 msgid "Authentication is required to delete a partition"
 msgstr "Autorisering er påkrævet for at slette en partition"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:98
+#: ../src/polkit-action-lookup.c:95
 msgid "Authentication is required to create a filesystem"
 msgstr "Autorisering er påkrævet for at skabe et fil system"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:102
+#: ../src/polkit-action-lookup.c:96
 msgid "Authentication is required to create a partition"
 msgstr "Autorisering er påkrævet for at skabe en partition"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:106
+#: ../src/polkit-action-lookup.c:97
 msgid "Authentication is required to modify a partition"
 msgstr "Autorisering er påkrævet for at ændre en partition"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:110
+#: ../src/polkit-action-lookup.c:98
 msgid "Authentication is required to create a partition table"
 msgstr "Autorisering er påkrævet for at skabe en partition tabel"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:114
+#: ../src/polkit-action-lookup.c:99
 msgid "Authentication is required to set the file system label"
 msgstr "Autorisering er påkrævet for at sætte fil system mærkat"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:118
+#: ../src/polkit-action-lookup.c:100
 msgid "Authentication is required to stop a Software RAID device"
 msgstr "Autorisering er påkrævet for at stoppen en RAID enhed"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:122
+#: ../src/polkit-action-lookup.c:101
+#, fuzzy
+msgid "Authentication is required to check a Software RAID device"
+msgstr "Autorisering er påkrævet for at stoppen en RAID enhed"
+
+#: ../src/polkit-action-lookup.c:102
+#, fuzzy
+msgid "Authentication is required to repair a Software RAID device"
+msgstr "Autorisering er påkrævet for starte en RAID enhed"
+
+#: ../src/polkit-action-lookup.c:103
 msgid ""
 "Authentication is required to add a new component to a Software RAID device"
 msgstr ""
 "Autorisering er påkrævet for at tilføje en ny komponent til en RAID enhed"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:126
+#: ../src/polkit-action-lookup.c:104
 msgid ""
 "Authentication is required to remove a component from a Software RAID device"
 msgstr "Autorisering er påkrævet for at fjerne en komponent fra en RAID enhed"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:130
+#: ../src/polkit-action-lookup.c:105
 msgid "Authentication is required to start a Software RAID device"
 msgstr "Autorisering er påkrævet for starte en RAID enhed"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:134
+#: ../src/polkit-action-lookup.c:106
+#, fuzzy
+msgid "Authentication is required to create a Software RAID device"
+msgstr "Autorisering er påkrævet for starte en RAID enhed"
+
+#: ../src/polkit-action-lookup.c:107
 msgid "Authentication is required to inhibit polling on a drive"
 msgstr ""
 "Autorisering er påkrævet for at undertrykke medie detektion for et drev"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:138
+#: ../src/polkit-action-lookup.c:108
 msgid "Authentication is required to poll for media"
 msgstr "Autorisering er påkrævet for at tjekke medie"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:142
+#: ../src/polkit-action-lookup.c:109
 msgid "Authentication is required to inhibit all drive polling"
 msgstr "Autorisering er påkrævet for at undertrykke al medie detektion"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:212
+#: ../src/polkit-action-lookup.c:187
 msgid "Device"
 msgstr "Enhed"
 
-#: ../src/devkit-disks-polkit-action-lookup.c:231
+#: ../src/polkit-action-lookup.c:212
 msgid "Drive"
 msgstr "Drev"

diff --git a/policy/.gitignore b/policy/.gitignore
index f5cbf1c..332849d 100644 (file)
--- a/policy/.gitignore
+++ b/policy/.gitignore
@@ -1,4 +1,4 @@
 Makefile
 Makefile.in
-org.freedesktop.devicekit.disks.policy
+org.freedesktop.udisks.policy
 

diff --git a/policy/Makefile.am b/policy/Makefile.am
index ba9ae19..bc294f3 100644 (file)
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -6,6 +6,6 @@ dist_policy_DATA = org.freedesktop.udisks.policy
 clean-local :
        rm -f *~ *.policy
 
-DISTCLEANFILES = $(dist_devkit_policy_DATA)
+DISTCLEANFILES = $(dist_policy_DATA)
 
 EXTRA_DIST = $(dist_policy_DATA:.policy=.policy.in)

diff --git a/policy/org.freedesktop.udisks.policy.in b/policy/org.freedesktop.udisks.policy.in
index 446fe7a..8942a95 100644 (file)
--- a/policy/org.freedesktop.udisks.policy.in
+++ b/policy/org.freedesktop.udisks.policy.in
@@ -5,11 +5,11 @@
  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
 
 <policyconfig>
-  <vendor>The DeviceKit Project</vendor>
-  <vendor_url>http://hal.freedesktop.org/docs/DeviceKit/</vendor_url>
+  <vendor>The udisks Project</vendor>
+  <vendor_url>http://udisks.freedesktop.org/</vendor_url>
   <icon_name>drive-removable-media</icon_name>
 
-  <action id="org.freedesktop.devicekit.disks.filesystem-mount">
+  <action id="org.freedesktop.udisks.filesystem-mount">
     <_description>Mount a device</_description>
     <_message>Authentication is required to mount the device</_message>
     <defaults>
@@ -19,7 +19,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.filesystem-mount-system-internal">
+  <action id="org.freedesktop.udisks.filesystem-mount-system-internal">
     <_description>Mount a system-internal device</_description>
     <_message>Authentication is required to mount the device</_message>
     <defaults>
@@ -29,7 +29,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.filesystem-check">
+  <action id="org.freedesktop.udisks.filesystem-check">
     <_description>Check file system on a device</_description>
     <_message>Authentication is required to check the file system on the device</_message>
     <defaults>
@@ -39,7 +39,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.filesystem-check-system-internal">
+  <action id="org.freedesktop.udisks.filesystem-check-system-internal">
     <_description>Check file system of a system-internal device</_description>
     <_message>Authentication is required to check the file system on the device</_message>
     <defaults>
@@ -49,7 +49,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.filesystem-unmount-others">
+  <action id="org.freedesktop.udisks.filesystem-unmount-others">
     <_description>Unmount a device mounted by another user</_description>
     <_message>Authentication is required to unmount devices mounted by another user</_message>
     <defaults>
@@ -59,7 +59,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.filesystem-lsof">
+  <action id="org.freedesktop.udisks.filesystem-lsof">
     <_description>List open files</_description>
     <_message>Authentication is required to list open files on a mounted file system</_message>
     <defaults>
@@ -69,7 +69,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.filesystem-lsof-system-internal">
+  <action id="org.freedesktop.udisks.filesystem-lsof-system-internal">
     <_description>List open files on a system-internal device</_description>
     <_message>Authentication is required to list open files on a mounted file system</_message>
     <defaults>
@@ -79,7 +79,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.drive-eject">
+  <action id="org.freedesktop.udisks.drive-eject">
     <_description>Eject media from a device</_description>
     <_message>Authentication is required to eject media from the device</_message>
     <defaults>
@@ -89,7 +89,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.drive-detach">
+  <action id="org.freedesktop.udisks.drive-detach">
     <_description>Detach a drive</_description>
     <_message>Authentication is required to detach the drive</_message>
     <defaults>
@@ -99,7 +99,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.change">
+  <action id="org.freedesktop.udisks.change">
     <_description>Modify a device</_description>
     <_message>Authentication is required to modify the device</_message>
     <defaults>
@@ -109,7 +109,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.change-system-internal">
+  <action id="org.freedesktop.udisks.change-system-internal">
     <_description>Modify a system-internal device</_description>
     <_message>Authentication is required to modify the device</_message>
     <defaults>
@@ -119,7 +119,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.drive-ata-smart-refresh">
+  <action id="org.freedesktop.udisks.drive-ata-smart-refresh">
     <_description>Refresh ATA SMART data</_description>
     <_message>Authentication is required to refresh ATA SMART data</_message>
     <defaults>
@@ -129,7 +129,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.drive-ata-smart-selftest">
+  <action id="org.freedesktop.udisks.drive-ata-smart-selftest">
     <_description>Run ATA SMART Self Tests</_description>
     <_message>Authentication is required to run ATA SMART self tests</_message>
     <defaults>
@@ -139,7 +139,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.drive-ata-smart-retrieve-historical-data">
+  <action id="org.freedesktop.udisks.drive-ata-smart-retrieve-historical-data">
     <_description>Retrieve historical ATA SMART data</_description>
     <_message>Authentication is required to retrieve historical ATA SMART data</_message>
     <defaults>
@@ -149,7 +149,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.luks-unlock">
+  <action id="org.freedesktop.udisks.luks-unlock">
     <_description>Unlock an encrypted device</_description>
     <_message>Authentication is required to unlock an encrypted device</_message>
     <defaults>
@@ -159,7 +159,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.luks-lock-others">
+  <action id="org.freedesktop.udisks.luks-lock-others">
     <_description>Lock an encrypted device unlocked by another user</_description>
     <_message>Authentication is required to lock an encrypted device unlocked by another user</_message>
     <defaults>
@@ -169,7 +169,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.linux-md">
+  <action id="org.freedesktop.udisks.linux-md">
     <_description>Configure Linux Software RAID</_description>
     <_message>Authentication is required to configure Linux Software RAID devices</_message>
     <defaults>
@@ -179,7 +179,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.cancel-job-others">
+  <action id="org.freedesktop.udisks.cancel-job-others">
     <_description>Cancel a job initiated by another user</_description>
     <_message>Authentication is required to cancel a job initiated by another user</_message>
     <defaults>
@@ -189,7 +189,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.inhibit-polling">
+  <action id="org.freedesktop.udisks.inhibit-polling">
     <_description>Inhibit media detection</_description>
     <_message>Authentication is required to inhibit media detection</_message>
     <defaults>
@@ -199,7 +199,7 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.devicekit.disks.drive-set-spindown">
+  <action id="org.freedesktop.udisks.drive-set-spindown">
     <_description>Set drive spindown timeout</_description>
     <_message>Authentication is required to configure drive spindown timeout</_message>
     <defaults>

diff --git a/src/.gitignore b/src/.gitignore
index 06e2757..ec8d6d1 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -5,23 +5,18 @@ Makefile.in
 *.o
 *.lo
 *.la
-devkit-disks-daemon
-devkit-disks-daemon-glue.h
-devkit-disks-device-glue.h
-devkit-disks-dm-export
-devkit-disks-helper-change-filesystem-label
-devkit-disks-helper-create-partition
-devkit-disks-helper-create-partition-table
-devkit-disks-helper-delete-partition
-devkit-disks-helper-erase
-devkit-disks-helper-fstab-mounter
-devkit-disks-helper-linux-md-remove-component
-devkit-disks-helper-mkfs
-devkit-disks-helper-modify-partition
-devkit-disks-helper-smart-selftest
-devkit-disks-marshal.c
-devkit-disks-marshal.h
-org.freedesktop.DeviceKit.Disks.conf
-org.freedesktop.DeviceKit.Disks.service
-part_id
+udisks-daemon
+*-glue.h
+udisks-helper-change-filesystem-label
+udisks-helper-create-partition
+udisks-helper-create-partition-table
+udisks-helper-delete-partition
+udisks-helper-erase
+udisks-helper-fstab-mounter
+udisks-helper-linux-md-remove-component
+udisks-helper-mkfs
+udisks-helper-modify-partition
+udisks-helper-smart-selftest
+udisks-marshal.c
+udisks-marshal.h
 

diff --git a/src/daemon.c b/src/daemon.c
index 3cc54e9..b4db426 100644 (file)
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -2778,7 +2778,7 @@ daemon_drive_inhibit_all_polling (Daemon *daemon,
 {
   daemon_local_check_auth (daemon,
                            NULL,
-                           "org.freedesktop.devicekit.disks.inhibit-polling",
+                           "org.freedesktop.udisks.inhibit-polling",
                            "InhibitAllPolling",
                            TRUE,
                            daemon_drive_inhibit_all_polling_authorized_cb,
@@ -2986,7 +2986,7 @@ daemon_drive_set_all_spindown_timeouts (Daemon *daemon,
 
   daemon_local_check_auth (daemon,
                            NULL,
-                           "org.freedesktop.devicekit.disks.drive-set-spindown",
+                           "org.freedesktop.udisks.drive-set-spindown",
                            "DriveSetAllSpindownTimeouts",
                            TRUE,
                            daemon_drive_set_all_spindown_timeouts_authorized_cb,

diff --git a/src/device.c b/src/device.c
index 8d2e11a..d5467f3 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -5511,9 +5511,9 @@ device_filesystem_mount (Device *device,
   else
     {
       if (device->priv->device_is_system_internal)
-        action_id = "org.freedesktop.devicekit.disks.filesystem-mount-system-internal";
+        action_id = "org.freedesktop.udisks.filesystem-mount-system-internal";
       else
-        action_id = "org.freedesktop.devicekit.disks.filesystem-mount";
+        action_id = "org.freedesktop.udisks.filesystem-mount";
     }
 
   auth_no_user_interaction = FALSE;
@@ -5705,7 +5705,7 @@ device_filesystem_unmount (Device *device,
     {
       if (!is_device_in_fstab (device, NULL))
         {
-          action_id = "org.freedesktop.devicekit.disks.filesystem-unmount-others";
+          action_id = "org.freedesktop.udisks.filesystem-unmount-others";
         }
     }
   else
@@ -5714,7 +5714,7 @@ device_filesystem_unmount (Device *device,
       daemon_local_get_uid (device->priv->daemon, &uid, context);
       if (uid_of_mount != uid)
         {
-          action_id = "org.freedesktop.devicekit.disks.filesystem-unmount-others";
+          action_id = "org.freedesktop.udisks.filesystem-unmount-others";
         }
     }
 
@@ -5888,8 +5888,8 @@ device_filesystem_list_open_files (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           device->priv->device_is_system_internal ? "org.freedesktop.devicekit.disks.filesystem-lsof-system-internal"
-                           : "org.freedesktop.devicekit.disks.filesystem-lsof",
+                           device->priv->device_is_system_internal ? "org.freedesktop.udisks.filesystem-lsof-system-internal"
+                           : "org.freedesktop.udisks.filesystem-lsof",
                            "FilesystemListOpenFiles",
                            TRUE,
                            device_filesystem_list_open_files_authorized_cb,
@@ -6009,7 +6009,7 @@ device_drive_eject (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.drive-eject",
+                           "org.freedesktop.udisks.drive-eject",
                            "DriveEject",
                            TRUE,
                            device_drive_eject_authorized_cb,
@@ -6132,7 +6132,7 @@ device_drive_detach (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.drive-detach",
+                           "org.freedesktop.udisks.drive-detach",
                            "DriveDetach",
                            TRUE,
                            device_drive_detach_authorized_cb,
@@ -6233,8 +6233,8 @@ device_filesystem_check (Device *device,
   daemon_local_check_auth (device->priv->daemon,
                            device,
                            device->priv->device_is_system_internal ?
-                           "org.freedesktop.devicekit.disks.filesystem-check-system-internal" :
-                           "org.freedesktop.devicekit.disks.filesystem-check",
+                           "org.freedesktop.udisks.filesystem-check-system-internal" :
+                           "org.freedesktop.udisks.filesystem-check",
                            "FilesystemCheck",
                            TRUE,
                            device_filesystem_check_authorized_cb,
@@ -6397,8 +6397,8 @@ device_partition_delete (Device *device,
 {
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           device->priv->device_is_system_internal ? "org.freedesktop.devicekit.disks.change-system-internal"
-                           : "org.freedesktop.devicekit.disks.change",
+                           device->priv->device_is_system_internal ? "org.freedesktop.udisks.change-system-internal"
+                           : "org.freedesktop.udisks.change",
                            "PartitionDelete",
                            TRUE,
                            device_partition_delete_authorized_cb,
@@ -6790,8 +6790,8 @@ device_filesystem_create (Device *device,
 {
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           device->priv->device_is_system_internal ? "org.freedesktop.devicekit.disks.change-system-internal"
-                           : "org.freedesktop.devicekit.disks.change",
+                           device->priv->device_is_system_internal ? "org.freedesktop.udisks.change-system-internal"
+                           : "org.freedesktop.udisks.change",
                            "FilesystemCreate",
                            TRUE,
                            device_filesystem_create_authorized_cb,
@@ -6859,7 +6859,7 @@ device_job_cancel (Device *device,
   action_id = NULL;
   if (device->priv->job_initiated_by_uid != uid)
     {
-      action_id = "org.freedesktop.devicekit.disks.cancel-job-others";
+      action_id = "org.freedesktop.udisks.cancel-job-others";
     }
 
   daemon_local_check_auth (device->priv->daemon,
@@ -7250,8 +7250,8 @@ device_partition_create (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           device->priv->device_is_system_internal ? "org.freedesktop.devicekit.disks.change-system-internal"
-                           : "org.freedesktop.devicekit.disks.change",
+                           device->priv->device_is_system_internal ? "org.freedesktop.udisks.change-system-internal"
+                           : "org.freedesktop.udisks.change",
                            "PartitionCreate",
                            TRUE,
                            device_partition_create_authorized_cb,
@@ -7469,8 +7469,8 @@ device_partition_modify (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           device->priv->device_is_system_internal ? "org.freedesktop.devicekit.disks.change-system-internal"
-                           : "org.freedesktop.devicekit.disks.change",
+                           device->priv->device_is_system_internal ? "org.freedesktop.udisks.change-system-internal"
+                           : "org.freedesktop.udisks.change",
                            "PartitionModify",
                            TRUE,
                            device_partition_modify_authorized_cb,
@@ -7705,8 +7705,8 @@ device_partition_table_create (Device *device,
 {
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           device->priv->device_is_system_internal ? "org.freedesktop.devicekit.disks.change-system-internal"
-                           : "org.freedesktop.devicekit.disks.change",
+                           device->priv->device_is_system_internal ? "org.freedesktop.udisks.change-system-internal"
+                           : "org.freedesktop.udisks.change",
                            "PartitionTableCreate",
                            TRUE,
                            device_partition_table_create_authorized_cb,
@@ -8069,7 +8069,7 @@ device_luks_unlock (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.luks-unlock",
+                           "org.freedesktop.udisks.luks-unlock",
                            "LuksUnlock",
                            TRUE,
                            device_luks_unlock_authorized_cb,
@@ -8377,7 +8377,7 @@ device_luks_lock (Device *device,
   action_id = NULL;
   if (unlocked_by_uid != uid)
     {
-      action_id = "org.freedesktop.devicekit.disks.luks-lock-others";
+      action_id = "org.freedesktop.udisks.luks-lock-others";
     }
 
   daemon_local_check_auth (device->priv->daemon,
@@ -8506,8 +8506,8 @@ device_luks_change_passphrase (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           device->priv->device_is_system_internal ? "org.freedesktop.devicekit.disks.change-system-internal"
-                           : "org.freedesktop.devicekit.disks.change",
+                           device->priv->device_is_system_internal ? "org.freedesktop.udisks.change-system-internal"
+                           : "org.freedesktop.udisks.change",
                            "LuksChangePassphrase",
                            TRUE,
                            device_luks_change_passphrase_authorized_cb,
@@ -8665,8 +8665,8 @@ device_filesystem_set_label (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           device->priv->device_is_system_internal ? "org.freedesktop.devicekit.disks.change-system-internal"
-                           : "org.freedesktop.devicekit.disks.change",
+                           device->priv->device_is_system_internal ? "org.freedesktop.udisks.change-system-internal"
+                           : "org.freedesktop.udisks.change",
                            "FilesystemSetLabel",
                            TRUE,
                            device_filesystem_set_label_authorized_cb,
@@ -8890,7 +8890,7 @@ device_drive_ata_smart_refresh_data (Device *device,
   action_id = NULL;
   if (context != NULL)
     {
-      action_id = "org.freedesktop.devicekit.disks.drive-ata-smart-refresh";
+      action_id = "org.freedesktop.udisks.drive-ata-smart-refresh";
     }
 
   daemon_local_check_auth (device->priv->daemon,
@@ -9021,7 +9021,7 @@ device_drive_ata_smart_initiate_selftest (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.drive-ata-smart-selftest",
+                           "org.freedesktop.udisks.drive-ata-smart-selftest",
                            "DriveAtaSmartInitiateSelftest",
                            TRUE,
                            device_drive_ata_smart_initiate_selftest_authorized_cb,
@@ -9119,7 +9119,7 @@ device_linux_md_stop (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.linux-md",
+                           "org.freedesktop.udisks.linux-md",
                            "LinuxMdStop",
                            TRUE,
                            device_linux_md_stop_authorized_cb,
@@ -9253,7 +9253,7 @@ device_linux_md_check (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.linux-md",
+                           "org.freedesktop.udisks.linux-md",
                            job_name,
                            TRUE,
                            device_linux_md_check_authorized_cb,
@@ -9389,7 +9389,7 @@ device_linux_md_add_component (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.linux-md",
+                           "org.freedesktop.udisks.linux-md",
                            "LinuxMdAddComponent",
                            TRUE,
                            device_linux_md_add_component_authorized_cb,
@@ -9642,7 +9642,7 @@ device_linux_md_remove_component (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.linux-md",
+                           "org.freedesktop.udisks.linux-md",
                            "LinuxMdRemoveComponent",
                            TRUE,
                            device_linux_md_remove_component_authorized_cb,
@@ -9992,7 +9992,7 @@ daemon_linux_md_start (Daemon *daemon,
 
   daemon_local_check_auth (daemon,
                            NULL,
-                           "org.freedesktop.devicekit.disks.linux-md",
+                           "org.freedesktop.udisks.linux-md",
                            "LinuxMdStart",
                            TRUE,
                            daemon_linux_md_start_authorized_cb,
@@ -10379,7 +10379,7 @@ daemon_linux_md_create (Daemon *daemon,
 
   daemon_local_check_auth (daemon,
                            NULL,
-                           "org.freedesktop.devicekit.disks.linux-md",
+                           "org.freedesktop.udisks.linux-md",
                            "LinuxMdCreate",
                            TRUE,
                            daemon_linux_md_create_authorized_cb,
@@ -10753,7 +10753,7 @@ device_drive_inhibit_polling (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.inhibit-polling",
+                           "org.freedesktop.udisks.inhibit-polling",
                            "DriveInhibitPolling",
                            TRUE,
                            device_drive_inhibit_polling_authorized_cb,
@@ -10883,7 +10883,7 @@ device_drive_poll_media (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.inhibit-polling",
+                           "org.freedesktop.udisks.inhibit-polling",
                            "DrivePollMedia",
                            TRUE,
                            device_drive_poll_media_authorized_cb,
@@ -10989,7 +10989,7 @@ device_drive_set_spindown_timeout (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.drive-set-spindown",
+                           "org.freedesktop.udisks.drive-set-spindown",
                            "DriveSetSpindownTimeout",
                            TRUE,
                            device_drive_set_spindown_timeout_authorized_cb,
@@ -11221,7 +11221,7 @@ device_drive_benchmark (Device *device,
 
   daemon_local_check_auth (device->priv->daemon,
                            device,
-                           "org.freedesktop.devicekit.disks.change",
+                           "org.freedesktop.udisks.change",
                            "DriveBenchmark",
                            TRUE,
                            device_drive_benchmark_authorized_cb,

diff --git a/src/polkit-action-lookup.c b/src/polkit-action-lookup.c
index d1fea9c..62199b2 100644 (file)
--- a/src/polkit-action-lookup.c
+++ b/src/polkit-action-lookup.c
@@ -122,7 +122,7 @@ udisks_action_lookup_get_message (PolkitBackendActionLookup *lookup,
 
   ret = NULL;
 
-  if (!g_str_has_prefix (action_id, "org.freedesktop.devicekit.disks."))
+  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
     goto out;
 
   operation = polkit_details_lookup (details, "operation");
@@ -152,7 +152,7 @@ udisks_action_lookup_get_icon_name (PolkitBackendActionLookup *lookup,
 
   ret = NULL;
 
-  if (!g_str_has_prefix (action_id, "org.freedesktop.devicekit.disks."))
+  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
     goto out;
 
   /* explicitly left blank for now */
@@ -173,7 +173,7 @@ udisks_action_lookup_get_details (PolkitBackendActionLookup *lookup,
   GString *str;
   PolkitDetails *ret;
 
-  if (!g_str_has_prefix (action_id, "org.freedesktop.devicekit.disks."))
+  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
     return NULL;
 
   ret = polkit_details_new ();

diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am
index 820e481..b6538df 100644 (file)
--- a/src/probers/Makefile.am
+++ b/src/probers/Makefile.am
@@ -27,14 +27,14 @@ udisks_part_id_SOURCES = part-id.c
 udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
 udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) $(top_builddir)/src/helpers/libpartutil.la
 
-udisks_dm_export_SOURCES = devkit-disks-dm-export.c
+udisks_dm_export_SOURCES = udisks-dm-export.c
 udisks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
 udisks_dm_export_LDADD = $(DEVMAPPER_LIBS)
 
-udisks_probe_ata_smart_SOURCES = devkit-disks-probe-ata-smart.c
+udisks_probe_ata_smart_SOURCES = udisks-probe-ata-smart.c
 udisks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
 udisks_probe_ata_smart_LDADD = $(LIBATASMART_LIBS)
 
-udisks_probe_sas_expander_SOURCES = devkit-disks-probe-sas-expander.c
+udisks_probe_sas_expander_SOURCES = udisks-probe-sas-expander.c
 udisks_probe_sas_expander_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 udisks_probe_sas_expander_LDADD = $(GLIB_LIBS)

diff --git a/src/probers/devkit-disks-dm-export.c b/src/probers/udisks-dm-export.c
similarity index 100%
rename from src/probers/devkit-disks-dm-export.c
rename to src/probers/udisks-dm-export.c

diff --git a/src/probers/devkit-disks-probe-ata-smart.c b/src/probers/udisks-probe-ata-smart.c
similarity index 100%
rename from src/probers/devkit-disks-probe-ata-smart.c
rename to src/probers/udisks-probe-ata-smart.c

diff --git a/src/probers/devkit-disks-probe-sas-expander.c b/src/probers/udisks-probe-sas-expander.c
similarity index 100%
rename from src/probers/devkit-disks-probe-sas-expander.c
rename to src/probers/udisks-probe-sas-expander.c

diff --git a/tools/.gitignore b/tools/.gitignore
index da10c16..4062de4 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -2,10 +2,10 @@
 Makefile
 Makefile.in
 *.o
-devkit-disks
-devkit-disks-daemon-glue.h
-devkit-disks-device-glue.h
-devkit-disks-marshal.c
-devkit-disks-marshal.h
-umount.devkit
+udisks
+udisks-daemon-glue.h
+udisks-device-glue.h
+udisks-marshal.c
+udisks-marshal.h
+umount.udisks