summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--data/zenity.13
-rw-r--r--help/C/zenity.xml15
3 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index abea3a2..04dbb3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-08 Lucas Rocha <lucasr@gnome.org>
+
+ * data/zenity.1: document --timeout (Fixes bug #565133).
+ Patch from Luca Bruno <lethalman88@gmail.com>.
+
2008-09-23 Vincent Untz <vuntz@gnome.org>
* configure.in: post-release bump to 2.24.1.
diff --git a/data/zenity.1 b/data/zenity.1
index 2cee723..9acfcc4 100644
--- a/data/zenity.1
+++ b/data/zenity.1
@@ -76,6 +76,9 @@ Set the dialog width
.TP
.B \-\-height=HEIGHT
Set the dialog height
+.TP
+.B \-\-timeout=TIMEOUT
+Set the dialog timeout
.PP
Calendar options
diff --git a/help/C/zenity.xml b/help/C/zenity.xml
index 8e4c644..350b1dc 100644
--- a/help/C/zenity.xml
+++ b/help/C/zenity.xml
@@ -225,6 +225,14 @@
<para>An unexpected error has occurred.</para>
</entry>
</row>
+ <row valign="top">
+ <entry>
+ <para><varname>5</varname></para>
+ </entry>
+ <entry>
+ <para>The dialog has been closed because the timeout has been reached.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -274,6 +282,13 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--timeout</option>=<replaceable>timeout</replaceable></term>
+ <listitem>
+ <para>Specifies the timeout in seconds after which the dialog is closed.</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</sect2>