Merge fix for 152851 from HEAD.

2004-09-21  Kjartan Maraas  <kmaraas@gnome.org>

	* src/progress.c:
	* src/tree.c:
	* src/util.c: (transient_get_xterm),
	(transient_get_xterm_toplevel): Merge fix
	for 152851 from HEAD.

4 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c77876..f86ec34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* src/progress.c:
+	* src/tree.c:
+	* src/util.c: (transient_get_xterm),
+	(transient_get_xterm_toplevel): Merge fix
+	for 152851 from HEAD.
+
 2004-09-13  Glynn Foster  <glynn.foster@sun.com>
 
 	* configure.in: Post release bump.
diff --git a/src/progress.c b/src/progress.c
index 373c5b8..c055baf 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#include <unistd.h>
 #include <signal.h>
 #include <glade/glade.h>
 #include "zenity.h"
diff --git a/src/tree.c b/src/tree.c
index fed58e2..9aeee4f 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -25,6 +25,7 @@
 
 #include <glade/glade.h>
 #include <string.h>
+#include <stdlib.h>
 #include "zenity.h"
 #include "util.h"
 
diff --git a/src/util.c b/src/util.c
index 3364e30..670cea4 100644
--- a/src/util.c
+++ b/src/util.c
@@ -269,7 +269,7 @@ zenity_util_return_exit_code ( ZenityExitCode value )
 #ifdef GDK_WINDOWING_X11
 
 static Window
-transient_get_xterm ()
+transient_get_xterm (void)
 {
   const char *wid_str = g_getenv ("WINDOWID");
   if (wid_str) {
@@ -306,7 +306,7 @@ transient_is_toplevel (Window wid)
  */
 
 static Window
-transient_get_xterm_toplevel ()
+transient_get_xterm_toplevel (void)
 {
   Window xterm = transient_get_xterm ();
   Display *dpy = GDK_DISPLAY ();