Patch from Dagmar d'Surreal <dagmar@speakeasy.net> to correct help docs

2003-05-24  Glynn Foster  <glynn.foster@sun.com>

	* help/C/zenity.xml: Patch from Dagmar d'Surreal
	<dagmar@speakeasy.net> to correct help docs and
	script examples for the change from --dialog-title to
	--title.

	* THANKS, src/about.c: Add Dagmar.

	* src/progress.c: For now, just send a SIGHUP to the
	parent process - not entirely sure if this is the best thing
	to do right now.

5 files changed, 28 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index efaab9b4..ffa7e380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-05-24  Glynn Foster  <glynn.foster@sun.com>
+
+	* help/C/zenity.xml: Patch from Dagmar d'Surreal
+	<dagmar@speakeasy.net> to correct help docs and 
+	script examples for the change from --dialog-title to 
+	--title.
+
+	* THANKS, src/about.c: Add Dagmar.
+
+	* src/progress.c: For now, just send a SIGHUP to the 
+	parent process - not entirely sure if this is the best thing
+	to do right now.
+
 2003-05-23  Mike Newman <mikegtn@gnome.org>
 
 	* src/gdialog: fixed --textbox to actually load filename
diff --git a/THANKS b/THANKS
index 83786e84..1544f6be 100644
--- a/THANKS
+++ b/THANKS
@@ -9,4 +9,5 @@ Mike Newman <mike@gtnorthern.demon.co.uk>
 Havoc Pennington <hp@redhat.com>
 Kristian Rietveld <kris@gtk.org>
 Jakub Steiner <jimmac@ximian.com>
+Danel d'Surreal <dagmar@speakeasy.net>
 Tom Tromey <tromey@redhat.com>
diff --git a/help/C/zenity.xml b/help/C/zenity.xml
index 6d6257ab..e7c9bfb7 100644
--- a/help/C/zenity.xml
+++ b/help/C/zenity.xml
@@ -171,7 +171,7 @@
 
     <para>
 	When using &app;, make sure that any arguments to the command line options are surrounded by
-	a set of quotes ' ' or " " as in <command>&app; --calendar --dialog-title="Holiday Planner"
+	a set of quotes ' ' or " " as in <command>&app; --calendar --title="Holiday Planner"
 	</command>, for example. If you do not use quotes, then it is likely that you will get
 	unexpected results.
     </para>
@@ -343,7 +343,7 @@
 		<programlisting>
 		#!/bin/sh
 
-		if zenity --calendar --dialog-title="Calendar selection" --text="Select a date from below" --day=18 --month=1 --year=2003
+		if zenity --calendar --title="Calendar selection" --text="Select a date from below" --day=18 --month=1 --year=2003
 		  then echo $?
 		  else echo "No date selected"
 		fi
@@ -410,7 +410,7 @@
 		<programlisting>
 		#!/bin/sh
 
-		if zenity --entry --dialog-title="Add a new entry" --text="Enter your _Password" --hide-text
+		if zenity --entry --title="Add a new entry" --text="Enter your _Password" --hide-text
 		  then echo $?
 		  else echo "No password entered"
 		fi
@@ -561,7 +561,7 @@
 		<programlisting>
 		#!/bin/sh
 
-		FILE=`zenity --file-selection --dialog-title="Select a file"'
+		FILE=`zenity --file-selection --title="Select a file"'
 
 		case $? in
 		         0)
@@ -667,7 +667,7 @@
     <para>
     	The following commandline shows an example of how to use the List dialog:
 		<programlisting>
-		zenity --list --dialog-title="Choose bugs you wish to view" \
+		zenity --list --title="Choose bugs you wish to view" \
 		       --text="Select items from the list below." \
 		       --column="Bug Number" --column="Severity" --column="Description" \
 		       992383 Normal "GtkTreeView crashes on multiple selections" \
@@ -748,7 +748,7 @@
 		echo "# Rebooting system" ; sleep 1
 		echo "100" ; sleep 1
 		) |
-		zenity --progress --dialog-title="Update System Logs" --text="Scanning mail logs..." --percentage=0
+		zenity --progress --title="Update System Logs" --text="Scanning mail logs..." --percentage=0
 
 		if [ "$?" = -1 ] ; then
 			zenity --error --text="Update cancelled."
@@ -808,11 +808,11 @@
 		<programlisting>
 		#!/bin/sh
 
-		FILE=`zenity --file-selection --dialog-title="Select a file"'
+		FILE=`zenity --file-selection --title="Select a file"'
 
 		case $? in
 		         0)
-			  	zenity --text-info --dialog-title=$FILE --editable 2>/tmp/tmp.txt
+			  	zenity --text-info --title=$FILE --editable 2>/tmp/tmp.txt
 							
 		         1)
 			        echo "No file selected.";;
diff --git a/src/about.c b/src/about.c
index 2adcf642..182a8165 100644
--- a/src/about.c
+++ b/src/about.c
@@ -59,6 +59,7 @@ static const gchar *author_credits[] = {
   "Havoc Pennington <hp@redhat.com>",
   "Kristian Rietveld <kris@gtk.org>",
   "Jakub Steiner <jimmac@ximian.com>",
+  "Daniel d'Surreal <dagmar@speakeasy.net>",
   "Tom Tromey <tromey@redhat.com>",
   NULL
 };
diff --git a/src/progress.c b/src/progress.c
index aad133a2..f7444c42 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -212,8 +212,11 @@ zenity_progress_dialog_response (GtkWidget *widget, int response, gpointer data)
       break;
 		
     case GTK_RESPONSE_CANCEL:
-      /* FIXME: This should kill off the parent process - not entirely sure how to achieve this */
-      kill (0);
+      /* FIXME: This should kill off the parent process nicely and return an error code
+       * I'm pretty sure there is a nice way to do this, but I'm clueless about this
+       * stuff. Should be using SIGHUP instead of 1 though.
+       */
+      kill (getpid (), 1);
       zen_data->exit_code = 1;
       gtk_main_quit ();
       break;