From d1e50d1af0458230bdd5cd904ebf40f7600801ec Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Tue, 1 Jun 2010 17:22:38 -0400 Subject: [PATCH] Avoid using entities in introspection XML Unfortunately GMarkup doesn't understand entities so gdbus-binding-tool will not work with these XML files without this patch. --- data/org.freedesktop.UDisks.Adapter.xml | 13 +- data/org.freedesktop.UDisks.Device.xml | 227 +++++++++++++++---------------- data/org.freedesktop.UDisks.Expander.xml | 13 +- data/org.freedesktop.UDisks.Port.xml | 13 +- data/org.freedesktop.UDisks.xml | 121 ++++++++-------- 5 files changed, 167 insertions(+), 220 deletions(-) diff --git a/data/org.freedesktop.UDisks.Adapter.xml b/data/org.freedesktop.UDisks.Adapter.xml index 8ac784e..4d2fdf3 100644 --- a/data/org.freedesktop.UDisks.Adapter.xml +++ b/data/org.freedesktop.UDisks.Adapter.xml @@ -1,17 +1,6 @@ - - - - - - - - - -]> +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> diff --git a/data/org.freedesktop.UDisks.Device.xml b/data/org.freedesktop.UDisks.Device.xml index ed722e6..8b76ccb 100644 --- a/data/org.freedesktop.UDisks.Device.xml +++ b/data/org.freedesktop.UDisks.Device.xml @@ -1,17 +1,6 @@ - - - - - - - - - -]> +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> @@ -77,8 +66,8 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed + if the caller lacks the appropriate PolicyKit authorization + if the operation failed @@ -150,10 +139,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device or a partition on it are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the device or a partition on it are busy + if the operation failed + if the job was cancelled @@ -190,10 +179,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the device is busy + if the operation failed + if the job was cancelled @@ -329,10 +318,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the device is busy + if the operation failed + if the job was cancelled @@ -389,10 +378,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if the enclosing partition table device is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the enclosing partition table device is busy + if the operation failed + if the job was cancelled @@ -454,11 +443,11 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy - if the operation failed - if the job was cancelled - if mkfs for this type is not available + if the caller lacks the appropriate PolicyKit authorization + if the device is busy + if the operation failed + if the job was cancelled + if mkfs for this type is not available @@ -500,11 +489,11 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy and changing the label requires an unmounted file system - if the operation failed - if the job was cancelled - if the label changing tool for this file system type is not available + if the caller lacks the appropriate PolicyKit authorization + if the device is busy and changing the label requires an unmounted file system + if the operation failed + if the job was cancelled + if the label changing tool for this file system type is not available @@ -552,12 +541,12 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy - if the operation failed - if the job was cancelled - if an invalid or malformed mount option was given - if the kernel driver for this file system type is not available + if the caller lacks the appropriate PolicyKit authorization + if the device is busy + if the operation failed + if the job was cancelled + if an invalid or malformed mount option was given + if the kernel driver for this file system type is not available @@ -589,11 +578,11 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy - if the operation failed - if the job was cancelled - if an invalid or malformed unmount option was given + if the caller lacks the appropriate PolicyKit authorization + if the device is busy + if the operation failed + if the job was cancelled + if an invalid or malformed unmount option was given @@ -635,10 +624,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is mounted and the file system doesn't support online file system checking. See TODO for how to determine if a file system supports online fsck - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the device is mounted and the file system doesn't support online file system checking. See TODO for how to determine if a file system supports online fsck + if the operation failed + if the job was cancelled @@ -679,9 +668,9 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is mounted and the file system doesn't support online file system checking. See TODO for how to determine if a file system supports online fsck - if the operation failed + if the caller lacks the appropriate PolicyKit authorization + if the device is mounted and the file system doesn't support online file system checking. See TODO for how to determine if a file system supports online fsck + if the operation failed @@ -716,10 +705,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the device is busy + if the operation failed + if the job was cancelled @@ -751,10 +740,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the device is busy + if the operation failed + if the job was cancelled @@ -794,10 +783,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the device is busy + if the operation failed + if the job was cancelled @@ -832,10 +821,10 @@ - if the caller lacks the appropriate PolicyKit authorization - component to add is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + component to add is busy + if the operation failed + if the job was cancelled @@ -869,10 +858,10 @@ - if the caller lacks the appropriate PolicyKit authorization - component to add is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + component to add is busy + if the operation failed + if the job was cancelled @@ -908,10 +897,10 @@ - if the caller lacks the appropriate PolicyKit authorization - component to add is busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + component to add is busy + if the operation failed + if the job was cancelled @@ -942,9 +931,9 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the operation failed + if the job was cancelled @@ -975,9 +964,9 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the operation failed + if the job was cancelled @@ -1020,9 +1009,9 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the operation failed + if the job was cancelled @@ -1059,8 +1048,8 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed + if the caller lacks the appropriate PolicyKit authorization + if the operation failed @@ -1084,7 +1073,7 @@ - if the given cookie is malformed + if the given cookie is malformed @@ -1113,7 +1102,7 @@ - if the operation failed + if the operation failed @@ -1142,11 +1131,11 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device or a dependent device (e.g. partition or cleartext luks device) is busy (e.g. mounted) - if the operation failed - if the job was cancelled - if an invalid or malformed option was given + if the caller lacks the appropriate PolicyKit authorization + if the device or a dependent device (e.g. partition or cleartext luks device) is busy (e.g. mounted) + if the operation failed + if the job was cancelled + if an invalid or malformed option was given @@ -1188,11 +1177,11 @@ - if the caller lacks the appropriate PolicyKit authorization - if the device or a dependent device (e.g. partition or cleartext luks device) is busy (e.g. mounted) - if the operation failed - if the job was cancelled - if an invalid or malformed option was given + if the caller lacks the appropriate PolicyKit authorization + if the device or a dependent device (e.g. partition or cleartext luks device) is busy (e.g. mounted) + if the operation failed + if the job was cancelled + if an invalid or malformed option was given @@ -1243,9 +1232,9 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed - if an invalid or malformed option was given + if the caller lacks the appropriate PolicyKit authorization + if the operation failed + if an invalid or malformed option was given @@ -1278,8 +1267,8 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed + if the caller lacks the appropriate PolicyKit authorization + if the operation failed @@ -1315,9 +1304,9 @@ - if the caller lacks the appropriate PolicyKit authorization - If the disk is sleeping and the nowakeup option was passed - if the operation failed + if the caller lacks the appropriate PolicyKit authorization + If the disk is sleeping and the nowakeup option was passed + if the operation failed @@ -1354,9 +1343,9 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the operation failed + if the job was cancelled @@ -1422,9 +1411,9 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if the operation failed + if the job was cancelled diff --git a/data/org.freedesktop.UDisks.Expander.xml b/data/org.freedesktop.UDisks.Expander.xml index 322eb0e..364706a 100644 --- a/data/org.freedesktop.UDisks.Expander.xml +++ b/data/org.freedesktop.UDisks.Expander.xml @@ -1,17 +1,6 @@ - - - - - - - - - -]> +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> diff --git a/data/org.freedesktop.UDisks.Port.xml b/data/org.freedesktop.UDisks.Port.xml index eaf4a5f..bfc673b 100644 --- a/data/org.freedesktop.UDisks.Port.xml +++ b/data/org.freedesktop.UDisks.Port.xml @@ -1,17 +1,6 @@ - - - - - - - - - -]> +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> diff --git a/data/org.freedesktop.UDisks.xml b/data/org.freedesktop.UDisks.xml index a0d53a6..f790351 100644 --- a/data/org.freedesktop.UDisks.xml +++ b/data/org.freedesktop.UDisks.xml @@ -1,15 +1,6 @@ - - - - - - - -]> +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> @@ -174,8 +165,8 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed + if the caller lacks the appropriate PolicyKit authorization + if the operation failed @@ -199,7 +190,7 @@ - if the given cookie is malformed + if the given cookie is malformed @@ -247,9 +238,9 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed - if an invalid or malformed option was given + if the caller lacks the appropriate PolicyKit authorization + if the operation failed + if an invalid or malformed option was given @@ -282,8 +273,8 @@ - if the caller lacks the appropriate PolicyKit authorization - if the operation failed + if the caller lacks the appropriate PolicyKit authorization + if the operation failed @@ -318,10 +309,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -355,10 +346,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -392,10 +383,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -433,10 +424,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -473,10 +464,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -513,10 +504,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -553,10 +544,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -593,10 +584,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -663,10 +654,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -706,10 +697,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -757,10 +748,10 @@ - if the caller lacks the appropriate PolicyKit authorization - if one of the given components are busy - if the operation failed - if the job was cancelled + if the caller lacks the appropriate PolicyKit authorization + if one of the given components are busy + if the operation failed + if the job was cancelled @@ -782,7 +773,7 @@ Inhibits clients from invoking methods on the daemon of the daemon that require authorization (all methods - will return the &ERROR_INHIBITED; error) + will return the org.freedesktop.PolicyKit.Error.Inhibited error) if the caller is not the super user. This is typically used by OS installers and other programs that expects full control of the system, specifically @@ -793,7 +784,7 @@ Only the super user can invoke this method. - if the caller is not the super user + if the caller is not the super user @@ -817,7 +808,7 @@ - if the given cookie is malformed + if the given cookie is malformed -- 2.7.4