hal/doc/spec hal-spec.html,1.26,1.27 hal-spec.xml.in,1.23,1.24
David Zeuthen
david at freedesktop.org
Fri Sep 24 15:27:22 PDT 2004
Update of /cvs/hal/hal/doc/spec
In directory gabe:/tmp/cvs-serv16023/doc/spec
Modified Files:
hal-spec.html hal-spec.xml.in
Log Message:
2004-09-25 David Zeuthen <david at fubar.dk>
* configure.in: Added fr to ALL_LINGUAS
* po/fr.op: Added french translations from Jérôme Lodewyck
<lodewyck at clipper.ens.fr>
* libhal-storage/libhal-storage.h: Add prototypes for new functions
hal_drive_(requires_eject|get_dedication_icon_(drive|volume)).
* libhal-storage/libhal-storage.c (hal_storage_policy_lookup_icon):
Remove printf debug statement.
(hal_drive_get_dedicated_icon_drive): New function
(hal_drive_get_dedicated_icon_volume): New function
(hal_drive_from_udi): Read storage.icon.* and storage.requires_eject
(hal_drive_requires_eject): New function
* hald/linux/block_class_device.c (block_class_pre_process): Add
and set boolean property storage.requires_eject; right now we
only add it for optical drives. Interestingly enough, my iPod Mini
requires to be ejected as well (see RH bug #132195 for some
discussion).
* doc/spec/hal-spec.xml.in: Add docs for storage.requires_eject,
storage.icon.drive and storage.icon.volume
Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- hal-spec.html 20 Sep 2004 09:07:56 -0000 1.26
+++ hal-spec.html 24 Sep 2004 22:27:19 -0000 1.27
@@ -400,21 +400,21 @@
><DL
><DT
><A
-HREF="#AEN1852"
+HREF="#AEN1872"
>Interface org.freedesktop.Hal.Manager</A
></DT
><DD
><DL
><DT
><A
-HREF="#AEN1863"
+HREF="#AEN1883"
>Example</A
></DT
></DL
></DD
><DT
><A
-HREF="#AEN1871"
+HREF="#AEN1891"
>Interface org.freedesktop.Hal.Device</A
></DT
></DL
@@ -4371,6 +4371,19 @@
><TD
><TT
CLASS="literal"
+>storage.requires_eject</TT
+> (bool)</TD
+><TD
+> </TD
+><TD
+>Yes</TD
+><TD
+>The eject ioctl is required to properly eject the media</TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
>storage.hotpluggable</TT
> (bool)</TD
><TD
@@ -4527,6 +4540,52 @@
><TD
>The revision of the firmware of the drive</TD
></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>storage.icon.drive</TT
+> (string)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> Name of icon to use for displaying the drive. The name
+ must comply with freedesktop.org icon-theme specification
+ and must not be an absolute path.
+
+ This property exists such that e.g. OEM's can install
+ icons in <TT
+CLASS="literal"
+>/usr/share/icons/hicolor</TT
+>
+ a device information file matching their device.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>storage.icon.volume</TT
+> (string)</TD
+><TD
+> </TD
+><TD
+>No</TD
+><TD
+> Name of icon to use for displaying volumes from the drive.
+ The name must comply with freedesktop.org icon-theme
+ specification and must not be an absolute path.
+
+ This property exists such that e.g. OEM's can install
+ icons in <TT
+CLASS="literal"
+>/usr/share/icons/hicolor</TT
+>
+ a device information file matching their device.
+ </TD
+></TR
></TBODY
></TABLE
><P
@@ -4568,7 +4627,7 @@
><P
></P
><A
-NAME="AEN1399"
+NAME="AEN1419"
></A
><TABLE
BORDER="1"
@@ -4767,7 +4826,7 @@
><P
></P
><A
-NAME="AEN1479"
+NAME="AEN1499"
></A
><TABLE
BORDER="1"
@@ -4921,7 +4980,7 @@
><P
></P
><A
-NAME="AEN1537"
+NAME="AEN1557"
></A
><TABLE
BORDER="1"
@@ -5052,7 +5111,7 @@
><P
></P
><A
-NAME="AEN1579"
+NAME="AEN1599"
></A
><TABLE
BORDER="1"
@@ -5125,7 +5184,7 @@
><P
></P
><A
-NAME="AEN1601"
+NAME="AEN1621"
></A
><TABLE
BORDER="1"
@@ -5192,7 +5251,7 @@
><P
></P
><A
-NAME="AEN1621"
+NAME="AEN1641"
></A
><TABLE
BORDER="1"
@@ -5257,7 +5316,7 @@
><P
></P
><A
-NAME="AEN1641"
+NAME="AEN1661"
></A
><TABLE
BORDER="1"
@@ -5384,7 +5443,7 @@
><P
></P
><A
-NAME="AEN1685"
+NAME="AEN1705"
></A
><TABLE
BORDER="1"
@@ -5531,7 +5590,7 @@
><P
></P
><A
-NAME="AEN1733"
+NAME="AEN1753"
></A
><TABLE
BORDER="1"
@@ -5885,7 +5944,7 @@
><P
></P
><A
-NAME="AEN1810"
+NAME="AEN1830"
></A
><TABLE
BORDER="1"
@@ -6045,7 +6104,7 @@
><HR><H2
CLASS="sect1"
><A
-NAME="AEN1852"
+NAME="AEN1872"
>Interface org.freedesktop.Hal.Manager</A
></H2
><P
@@ -6161,7 +6220,7 @@
><HR><H3
CLASS="sect2"
><A
-NAME="AEN1863"
+NAME="AEN1883"
>Example</A
></H3
><P
@@ -6279,7 +6338,7 @@
><HR><H2
CLASS="sect1"
><A
-NAME="AEN1871"
+NAME="AEN1891"
>Interface org.freedesktop.Hal.Device</A
></H2
><P
Index: hal-spec.xml.in
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.xml.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- hal-spec.xml.in 20 Sep 2004 09:00:14 -0000 1.23
+++ hal-spec.xml.in 24 Sep 2004 22:27:20 -0000 1.24
@@ -2148,6 +2148,12 @@
<entry>Media can be removed from the storage device</entry>
</row>
<row>
+ <entry><literal>storage.requires_eject</literal> (bool)</entry>
+ <entry></entry>
+ <entry>Yes</entry>
+ <entry>The eject ioctl is required to properly eject the media</entry>
+ </row>
+ <row>
<entry><literal>storage.hotpluggable</literal> (bool)</entry>
<entry></entry>
<entry>Yes</entry>
@@ -2230,6 +2236,37 @@
<entry>The revision of the firmware of the drive</entry>
</row>
+ <row>
+ <entry><literal>storage.icon.drive</literal> (string)</entry>
+ <entry></entry>
+ <entry>No</entry>
+ <entry>
+ Name of icon to use for displaying the drive. The name
+ must comply with freedesktop.org icon-theme specification
+ and must not be an absolute path.
+
+ This property exists such that e.g. OEM's can install
+ icons in <literal>/usr/share/icons/hicolor</literal>
+ a device information file matching their device.
+ </entry>
+ </row>
+
+ <row>
+ <entry><literal>storage.icon.volume</literal> (string)</entry>
+ <entry></entry>
+ <entry>No</entry>
+ <entry>
+ Name of icon to use for displaying volumes from the drive.
+ The name must comply with freedesktop.org icon-theme
+ specification and must not be an absolute path.
+
+ This property exists such that e.g. OEM's can install
+ icons in <literal>/usr/share/icons/hicolor</literal>
+ a device information file matching their device.
+ </entry>
+ </row>
+
+
</tbody>
</tgroup>
</informaltable>
More information about the hal-commit
mailing list