Add from the 2 Sebastian's, and make email addresses more spam proof.

2004-04-26  Glynn Foster  <glynn.foster@sun.com>

	* THANKS, src/about.c: Add from the 2 Sebastian's, and make
	email addresses more spam proof.
	* src/calendar.c, src/entry.c, src/fileselection.c, src/msg.c,
	* src/progress.c, src/text.c, src/tree.c, src/util.c,
	* src/util.h: Patch from Sebastian Kapfer to make all zenity
	dialogs transients of the parent xterm. Fixes #136226.
	* src/zenity.glade: Patch from Sebastian Heinlein to
	improve things HIG wise. Fixes #140745.

11 files changed, 310 insertions, 132 deletions

diff --git a/src/about.c b/src/about.c
index b29047fb..5053371a 100644
--- a/src/about.c
+++ b/src/about.c
@@ -48,100 +48,102 @@ static void zenity_about_dialog_response (GtkWidget *widget, int response, gpoin
 static const gchar *author_credits[] = {
   "Authors",
   "=======",
-  "Glynn Foster <glynn.foster@sun.com>",
-  "Mike Newman <mikegtn@gnome.org>",
+  "Glynn Foster <glynn foster sun com>",
+  "Mike Newman <mikegtn gnome org>",
   "",
   "Patches from the following people",
   "=================================",
-  "Darren Adams  <darrenadams@dsl.pipex.com>",
-  "Peter Astrand  <astrand@lysator.liu.se>",
-  "Jonathan Blandford  <jrb@redhat.com>",
-  "Ross Burton  <ross@burtonini.com>",
-  "Damien Carbery  <damien.carbery@sun.com>",
-  "Anders Carlsson  <andersca@codefactory.se>",
-  "Nicholas Curran  <quasar@austar.net.au>",
-  "John Fleck  <jfleck@inkstain.net>",
-  "James Henstridge  <james@daa.com.au>",
-  "Mihai T. Lazarescu  <mihai@email.it>",
-  "Tomasz Koczko  <kloczek@pld.org.pl>",
-  "Jordi Mallach  <jordi@sindominio.net>",
-  "Kjartan Maraas  <kmaraas@gnome.org>",
-  "Buhan Milne  <bgmilne@linux-mandrake.com>",
-  "Christian Monneckes  <c-w-m@gmx.de>",
-  "Havoc Pennington  <hp@redhat.com>",
-  "Jan Arne Petersen  <jpetersen@uni-bonn.de>",
-  "Kevin C. Krinke  <kckrinke@opendoorsoftware.com>",
-  "Kristian Rietveld  <kris@gtk.org>",
-  "Christian Rose  <menthos@menthos.com>",
-  "Jakub Steiner  <jimmac@ximian.com>",
-  "Daniel d'Surreal  <dagmar@speakeasy.net>",
-  "Hidetoshi Tajima  <hidetoshi.tajima@sun.com>",
-  "Tom Tromey  <tromey@redhat.com>",
-  "Yann  <bloch@iie.cnam.fr>",
+  "Darren Adams  <darrenadams dsl pipex com>"
+  "Peter Astrand  <astrand lysator liu se>",
+  "Jonathan Blandford  <jrb redhat com>",
+  "Ross Burton  <ross burtonini com>",
+  "Damien Carbery  <damien carbery sun com>",
+  "Anders Carlsson  <andersca codefactory se>",
+  "Nicholas Curran  <quasar austar net au>",
+  "John Fleck  <jfleck inkstain net>",
+  "Sebastian Heinlein <glatzor pimpzkru de>",
+  "James Henstridge  <james daa com au>",
+  "Mihai T  Lazarescu  <mihai email it>",
+  "Sebastian Kapfer <sebastian_kapfer web de>",
+  "Tomasz Koczko  <kloczek pld org pl>",
+  "Jordi Mallach  <jordi sindominio net>",
+  "Kjartan Maraas  <kmaraas gnome org>",
+  "Buhan Milne  <bgmilne linux-mandrake com>",
+  "Christian Monneckes  <c-w-m gmx de>",
+  "Havoc Pennington  <hp redhat com>",
+  "Jan Arne Petersen  <jpetersen uni-bonn de>",
+  "Kevin C  Krinke  <kckrinke opendoorsoftware com>",
+  "Kristian Rietveld  <kris gtk org>",
+  "Christian Rose  <menthos menthos com>",
+  "Jakub Steiner  <jimmac ximian com>",
+  "Daniel d'Surreal  <dagmar speakeasy net>",
+  "Hidetoshi Tajima  <hidetoshi tajima sun com>",
+  "Tom Tromey  <tromey redhat com>",
+  "Yann  <bloch iie cnam fr>",
   "",
   "And all the translators that rock my world",
   "==========================================",
-  "Vincent van Adrighem  <v.vanadrighem@dirck.mine.nu>",
-  "Taneem Ahmed  <taneem@bengalinux.org>",
-  "Takeshi Aihana <aihana@gnome.gr.jp>",
-  "Amanpreet Singh Alam  <amanlinux@netscape.net>",
-  "Sanlig Badral  <badral@openmn.org>",
-  "Aygimantas Beruka  <uid0@tuxfamily.org>",
-  "Alberto Fernandez Benito <afernn@euskalnet.net>",
-  "Stefano Canepa  <sc@linux.it>",
-  "Young-Ho Cha <ganadist@mizi.com>",
-  "Abel Cheung  <maddog@linux.org.hk>",
-  "Zbigniew Chyla  <cyba@gnome.pl>",
-  "Fatih Demir  <kabalak@gtranslator.org>",
-  "Laurent Dhima  <laurenti@alblinux.net>",
-  "Paul Duffy <dubhthach@frink.nuigalway.ie>",
-  "Francisco Javier Fernandez  <serrador@arrakis.es>",
-  "Artur Flinta  <aflinta@cvs.gnome.org>",
-  "Alessio Frusciante  <algol@firenze.linux.it>",
-  "Evandro Fernandes Giovanini  <evandrofg@ig.com.br>",
-  "Pablo Gonzalo del Campo  <pablodc@bigfoot.com>",
-  "Dhurba Gnawali  <dhurbagnawali@hotmail.com>",
-  "Sammi Gunnarsson  <sammi@techattack.nu>",
-  "Dafydd Harries  <daf@parnassus.ath.cx>",
-  "Wang Jian  <lark@linux.net.cn>",
-  "Guntupalli Karunakar  <karunakar@freedomink.org>",
-  "Tomas Kuliavas  <tokul@users.sourceforge.net>",
-  "Priit Laes  <amd@tt.ee>",
-  "Iaki Larraaga  <dooteo@euskalgnu.org>",
-  "Ole Laursen  <olau@hardworking.dk>",
-  "Toivo Leedjrv  <toivo@linux.ee>",
-  "Duarte Loreto  <happyguy_pt@hotmail.com>",
-  "Johanna Makkonen  <johanna.makkonen@iki.fi>",
-  "Jordi Mallach  <jordi@sindominio.net>",
-  "Kjartan Maraas  <kmaraas@gnome.org>",
-  "Jordi Mas  <jmas@softcatala.org>",
-  "Kamagasako Masatoshi  <emerald@gnome.gr.jp>",
-  "Dmitry G. Mastrukov  <dmitry@taurussoft.org>",
-  "Arafat Medini  <lumina@silverpen.de>",
-  "Christophe Merlet  <redfox@redfoxcenter.org>",
-  "Mike Newman  <mikegtn@gnome.org>",
-  "Alexandre Folle de Menezes  <afmenez@terra.com.br>",
-  "Christian Neumair  <chris@gnome-de.org>",
-  "Metin Omirov  <metin@karegen.com>",
-  "Kostas Papadimas  <pkst@gmx.net>",
-  "Sami Pesonen  <sampeson@iki.fi>",
-  "Roozbeh Pournader  <roozbeh@sharif.edu>",
-  "Jarkko Ranta  <jjranta@cc.joensuu.fi>",
-  "Christian Rose  <menthos@menthos.com>",
-  "Changwoo Ryu  <cwryu@debian.org>",
-  "Pablo Saratxaga  <pablo@mandrakesoft.com>",
-  "Robert Sedak  <robert.sedak@sk.htnet.hr>",
-  "Paisa Seeluangsawat  <paisa@users.sf.net>",
-  "Danilo Segan  <dsegan@gmx.net>",
-  "Aasmund Skjaveland  <aasmunds@fys.uio.no>",
-  "Yuriy Syrota  <rasta@renome.rovno.ua>",
-  "Marcel Telka  <marcel@telka.sk>",
-  "Andras Timar  <timar@gnome.hu>",
-  "Miloslav Trmac  <mitr@volny.cz>",
-  "Mugurel Tudor <mugurelu@go.ro>",
-  "Daniel Yacob  <locales@geez.org>",
-  "Funda Wang  <fundawang@linux.net.cn>",
-  "Alexander Winston  <alexander.winston@comcast.net>",
+  "Vincent van Adrighem  <v vanadrighem dirck mine nu>",
+  "Taneem Ahmed  <taneem bengalinux org>",
+  "Takeshi Aihana <aihana gnome gr jp>",
+  "Amanpreet Singh Alam  <amanlinux netscape net>",
+  "Sanlig Badral  <badral openmn org>",
+  "Aygimantas Beruka  <uid0 tuxfamily org>",
+  "Alberto Fernandez Benito <afernn euskalnet net>",
+  "Stefano Canepa  <sc linux it>",
+  "Young-Ho Cha <ganadist mizi com>",
+  "Abel Cheung  <maddog linux org hk>",
+  "Zbigniew Chyla  <cyba gnome pl>",
+  "Fatih Demir  <kabalak gtranslator org>",
+  "Laurent Dhima  <laurenti alblinux net>",
+  "Paul Duffy <dubhthach frink nuigalway ie>",
+  "Francisco Javier Fernandez  <serrador arrakis es>",
+  "Artur Flinta  <aflinta cvs gnome org>",
+  "Alessio Frusciante  <algol firenze linux it>",
+  "Evandro Fernandes Giovanini  <evandrofg ig com br>",
+  "Pablo Gonzalo del Campo  <pablodc bigfoot com>",
+  "Dhurba Gnawali  <dhurbagnawali hotmail com>",
+  "Sammi Gunnarsson  <sammi techattack nu>",
+  "Dafydd Harries  <daf parnassus ath cx>",
+  "Wang Jian  <lark linux net cn>",
+  "Guntupalli Karunakar  <karunakar freedomink org>",
+  "Tomas Kuliavas  <tokul users sourceforge net>",
+  "Priit Laes  <amd tt ee>",
+  "Iaki Larraaga  <dooteo euskalgnu org>",
+  "Ole Laursen  <olau hardworking dk>",
+  "Toivo Leedjrv  <toivo linux ee>",
+  "Duarte Loreto  <happyguy_pt hotmail com>",
+  "Johanna Makkonen  <johanna makkonen iki fi>",
+  "Jordi Mallach  <jordi sindominio net>",
+  "Kjartan Maraas  <kmaraas gnome org>",
+  "Jordi Mas  <jmas softcatala org>",
+  "Kamagasako Masatoshi  <emerald gnome gr jp>",
+  "Dmitry G  Mastrukov  <dmitry taurussoft org>",
+  "Arafat Medini  <lumina silverpen de>",
+  "Christophe Merlet  <redfox redfoxcenter org>",
+  "Mike Newman  <mikegtn gnome org>",
+  "Alexandre Folle de Menezes  <afmenez terra com br>",
+  "Christian Neumair  <chris gnome-de org>",
+  "Metin Omirov  <metin karegen com>",
+  "Kostas Papadimas  <pkst gmx net>",
+  "Sami Pesonen  <sampeson iki fi>",
+  "Roozbeh Pournader  <roozbeh sharif edu>",
+  "Jarkko Ranta  <jjranta cc joensuu fi>",
+  "Christian Rose  <menthos menthos com>",
+  "Changwoo Ryu  <cwryu debian org>",
+  "Pablo Saratxaga  <pablo mandrakesoft com>",
+  "Robert Sedak  <robert sedak sk htnet hr>",
+  "Paisa Seeluangsawat  <paisa users sf net>",
+  "Danilo Segan  <dsegan gmx net>",
+  "Aasmund Skjaveland  <aasmunds fys uio no>",
+  "Yuriy Syrota  <rasta renome rovno ua>",
+  "Marcel Telka  <marcel telka sk>",
+  "Andras Timar  <timar gnome hu>",
+  "Miloslav Trmac  <mitr volny cz>",
+  "Mugurel Tudor <mugurelu go ro>",
+  "Daniel Yacob  <locales geez org>",
+  "Funda Wang <fundawang linux net cn>",
+  "Alexander Winston  <alexander winston comcast net>",
   NULL
 };
 
@@ -382,7 +384,7 @@ zenity_about (ZenityData *data)
   if (glade_dialog)
     g_object_unref (glade_dialog);
 
-  gtk_widget_show (dialog);
+  zenity_util_show_dialog (dialog);
   gtk_main ();
 }
 
diff --git a/src/calendar.c b/src/calendar.c
index f5cbb33c..2d297786 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -82,7 +82,7 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data)
     gtk_calendar_select_day (GTK_CALENDAR (calendar), cal_data->day);
 
   gtk_label_set_mnemonic_widget (GTK_LABEL (text), calendar);
-  gtk_widget_show (dialog);
+  zenity_util_show_dialog (dialog);
   gtk_main ();
 }
 
diff --git a/src/entry.c b/src/entry.c
index bf1811bd..36ff704a 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -80,7 +80,7 @@ zenity_entry (ZenityData *data, ZenityEntryData *entry_data)
 
   gtk_label_set_mnemonic_widget (GTK_LABEL (text), entry);
 
-  gtk_widget_show (dialog);
+  zenity_util_show_dialog (dialog);
   gtk_main ();
 }
 
diff --git a/src/fileselection.c b/src/fileselection.c
index 6a9b018c..a783b34a 100644
--- a/src/fileselection.c
+++ b/src/fileselection.c
@@ -68,7 +68,7 @@ void zenity_fileselection (ZenityData *data, ZenityFileData *file_data)
   if (file_data->multi)
     gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
 
-  gtk_widget_show (dialog);
+  zenity_util_show_dialog (dialog);
   gtk_main ();
 }
 
diff --git a/src/msg.c b/src/msg.c
index bd1450e0..7ce78c58 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -114,7 +114,7 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
   if (msg_data->dialog_text)
     gtk_label_set_text (GTK_LABEL (text), msg_data->dialog_text);
 
-  gtk_widget_show (dialog);
+  zenity_util_show_dialog (dialog);
   gtk_main ();
 }
 
diff --git a/src/progress.c b/src/progress.c
index 68c653d7..3cc4bd9a 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -207,8 +207,8 @@ zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
   if (progress_data->percentage > -1)
     gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 
                                    progress_data->percentage/100.0);
-	
-  gtk_widget_show (dialog);
+
+  zenity_util_show_dialog (dialog);
   zenity_progress_read_info (progress_data);
 
   gtk_main ();
diff --git a/src/text.c b/src/text.c
index fb119b05..88c08620 100644
--- a/src/text.c
+++ b/src/text.c
@@ -153,7 +153,7 @@ zenity_text (ZenityData *data, ZenityTextData *text_data)
   else
     gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400); 
 
-  gtk_widget_show (dialog);
+  zenity_util_show_dialog (dialog);
 
   if (glade_dialog)
     g_object_unref (glade_dialog);
diff --git a/src/tree.c b/src/tree.c
index 03404b04..a1c1bb95 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -437,7 +437,7 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
       zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view), n_columns, FALSE, tree_data->editable);
   }
 
-  gtk_widget_show (dialog);
+  zenity_util_show_dialog (dialog);
   gtk_main ();
 
   if (glade_dialog)
diff --git a/src/util.c b/src/util.c
index c521f173..3364e306 100644
--- a/src/util.c
+++ b/src/util.c
@@ -31,10 +31,15 @@
 #include <locale.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 #include "config.h"
 #include "util.h"
 #include "zenity.h"
 
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
 #define ZENITY_OK_DEFAULT	0
 #define ZENITY_CANCEL_DEFAULT	1
 #define ZENITY_ESC_DEFAULT	1
@@ -259,3 +264,91 @@ zenity_util_return_exit_code ( ZenityExitCode value )
       retval = atoi (env_var);
   return retval; 
 }
+
+
+#ifdef GDK_WINDOWING_X11
+
+static Window
+transient_get_xterm ()
+{
+  const char *wid_str = g_getenv ("WINDOWID");
+  if (wid_str) {
+    char *wid_str_end;
+    Window wid = strtoul (wid_str, &wid_str_end, 10);
+    if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0)
+      return wid;
+  }
+  return None;
+}
+
+static void
+transient_x_free (void *ptr)
+{
+  if (ptr)
+    XFree (ptr);
+}
+
+static gboolean
+transient_is_toplevel (Window wid)
+{
+  XTextProperty prop;
+  Display *dpy = GDK_DISPLAY ();
+  if (!XGetWMName (dpy, wid, &prop))
+    return FALSE;
+  transient_x_free (prop.value);
+  return !!prop.value;
+}
+
+/*
+ * GNOME Terminal doesn't give us its toplevel window, but the WM needs a
+ * toplevel XID for proper stacking.  Other terminals work fine without this
+ * magic.  We can't use GDK here since "xterm" is a foreign window.
+ */
+
+static Window
+transient_get_xterm_toplevel ()
+{
+  Window xterm = transient_get_xterm ();
+  Display *dpy = GDK_DISPLAY ();
+  while (xterm != None && !transient_is_toplevel (xterm))
+  {
+    Window root, parent, *children;
+    int nchildren;
+    XQueryTree (dpy, xterm,
+                &root, &parent,
+                &children, &nchildren);
+    transient_x_free (children);
+    if (parent == root)
+      xterm = None;
+    else
+      xterm = parent;
+  }
+  return xterm;
+}
+
+static void
+zenity_util_make_transient (GdkWindow *window)
+{
+  Window xterm = transient_get_xterm_toplevel ();
+  if (xterm != None) {
+    GdkWindow *gdkxterm = gdk_window_foreign_new (xterm);
+    if (gdkxterm) {
+      gdk_window_set_transient_for (window, gdkxterm);
+      g_object_unref (G_OBJECT (gdkxterm));
+    }
+  }
+}
+
+#endif /* GDK_WINDOWING_X11 */
+
+void
+zenity_util_show_dialog (GtkWidget *dialog)
+{
+  gtk_widget_realize (dialog);
+#ifdef GDK_WINDOWING_X11
+  g_assert (dialog->window);
+  zenity_util_make_transient (dialog->window);
+#endif
+  gtk_widget_show (dialog);
+}
+
diff --git a/src/util.h b/src/util.h
index 1374818a..69ec9122 100644
--- a/src/util.h
+++ b/src/util.h
@@ -21,6 +21,7 @@ void            zenity_util_set_window_icon_from_stock    (GtkWidget      *widge
                                                            const gchar    *stock_id);
 void		zenity_util_show_help                     (GError        **error);
 gint		zenity_util_return_exit_code 		  (ZenityExitCode value);                      
+void            zenity_util_show_dialog                   (GtkWidget      *widget);
                                
 G_END_DECLS
 
diff --git a/src/zenity.glade b/src/zenity.glade
index c33d797e..e1126b79 100644
--- a/src/zenity.glade
+++ b/src/zenity.glade
@@ -2,7 +2,6 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
-<requires lib="gnome"/>
 
 <widget class="GtkDialog" id="zenity_calendar_dialog">
   <property name="title" translatable="yes">Calendar selection</property>
@@ -11,6 +10,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 27 Dec 2002 19:08:11 GMT"/>
 
@@ -33,6 +37,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
 	    </widget>
 	  </child>
@@ -46,6 +51,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -148,20 +154,26 @@
 </widget>
 
 <widget class="GtkDialog" id="zenity_warning_dialog">
+  <property name="border_width">6</property>
   <property name="title" translatable="yes">Warning</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 27 Dec 2002 23:24:20 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox2">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">12</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area2">
@@ -176,6 +188,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
 	    </widget>
 	  </child>
@@ -189,6 +202,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -203,10 +217,10 @@
 
       <child>
 	<widget class="GtkHBox" id="hbox1">
-	  <property name="border_width">13</property>
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
+	  <property name="spacing">12</property>
 
 	  <child>
 	    <widget class="GtkImage" id="image1">
@@ -214,7 +228,7 @@
 	      <property name="stock">gtk-dialog-warning</property>
 	      <property name="icon_size">6</property>
 	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
+	      <property name="yalign">0</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
 	    </widget>
@@ -235,8 +249,8 @@
 	      <property name="wrap">True</property>
 	      <property name="selectable">False</property>
 	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">7</property>
+	      <property name="yalign">0</property>
+	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
 	    </widget>
 	    <packing>
@@ -264,6 +278,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="show_fileops">True</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 11:48:27 GMT"/>
 
@@ -274,6 +293,7 @@
       <property name="can_focus">True</property>
       <property name="has_focus">True</property>
       <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
     </widget>
   </child>
 
@@ -283,25 +303,32 @@
       <property name="can_default">True</property>
       <property name="can_focus">True</property>
       <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
     </widget>
   </child>
 </widget>
 
 <widget class="GtkDialog" id="zenity_question_dialog">
+  <property name="border_width">6</property>
   <property name="title" translatable="yes">Question</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:03:54 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox3">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">12</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area3">
@@ -316,6 +343,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
 	    </widget>
 	  </child>
@@ -329,6 +357,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -343,10 +372,10 @@
 
       <child>
 	<widget class="GtkHBox" id="hbox2">
-	  <property name="border_width">13</property>
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
+	  <property name="spacing">12</property>
 
 	  <child>
 	    <widget class="GtkImage" id="image2">
@@ -354,7 +383,7 @@
 	      <property name="stock">gtk-dialog-question</property>
 	      <property name="icon_size">6</property>
 	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
+	      <property name="yalign">0</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
 	    </widget>
@@ -375,8 +404,8 @@
 	      <property name="wrap">True</property>
 	      <property name="selectable">False</property>
 	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">7</property>
+	      <property name="yalign">0</property>
+	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
 	    </widget>
 	    <packing>
@@ -403,6 +432,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:15:37 GMT"/>
 
@@ -425,6 +459,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
 	    </widget>
 	  </child>
@@ -438,6 +473,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -525,6 +561,7 @@
 </widget>
 
 <widget class="GtkDialog" id="zenity_text_dialog">
+  <property name="border_width">6</property>
   <property name="title" translatable="yes">Text View</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
@@ -533,14 +570,19 @@
   <property name="default_height">200</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:34:38 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox5">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">6</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area5">
@@ -555,6 +597,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
@@ -569,7 +612,7 @@
 
       <child>
 	<widget class="GtkVBox" id="vbox5">
-	  <property name="border_width">7</property>
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">0</property>
@@ -588,6 +631,8 @@
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="editable">False</property>
+		  <property name="overwrite">False</property>
+		  <property name="accepts_tab">True</property>
 		  <property name="justification">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap_mode">GTK_WRAP_WORD</property>
 		  <property name="cursor_visible">True</property>
@@ -625,6 +670,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 14:46:29 GMT"/>
 
@@ -647,6 +697,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
 	    </widget>
 	  </child>
@@ -661,6 +712,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -740,20 +792,26 @@
 </widget>
 
 <widget class="GtkDialog" id="zenity_error_dialog">
+  <property name="border_width">6</property>
   <property name="title" translatable="yes">Error</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 15:05:42 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox7">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">12</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area7">
@@ -768,6 +826,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -789,9 +848,10 @@
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox3">
+	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">12</property>
 
 	      <child>
 		<widget class="GtkImage" id="image3">
@@ -799,7 +859,7 @@
 		  <property name="stock">gtk-dialog-error</property>
 		  <property name="icon_size">6</property>
 		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
+		  <property name="yalign">0</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		</widget>
@@ -820,7 +880,7 @@
 		  <property name="wrap">True</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
+		  <property name="yalign">0</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		</widget>
@@ -857,6 +917,11 @@
   <property name="default_height">200</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 22:19:04 GMT"/>
 
@@ -879,6 +944,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
 	    </widget>
 	  </child>
@@ -892,6 +958,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -983,20 +1050,26 @@
 </widget>
 
 <widget class="GtkDialog" id="zenity_info_dialog">
+  <property name="border_width">6</property>
   <property name="title" translatable="yes">Information</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 15:05:42 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox7">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">12</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area7">
@@ -1011,6 +1084,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -1034,7 +1108,7 @@
 	    <widget class="GtkHBox" id="hbox3">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">12</property>
 
 	      <child>
 		<widget class="GtkImage" id="image3">
@@ -1042,7 +1116,7 @@
 		  <property name="stock">gtk-dialog-info</property>
 		  <property name="icon_size">6</property>
 		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
+		  <property name="yalign">0</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		</widget>
@@ -1063,7 +1137,7 @@
 		  <property name="wrap">True</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
+		  <property name="yalign">0</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		</widget>
@@ -1098,6 +1172,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Tue, 14 Jan 2003 02:38:19 GMT"/>
 
@@ -1120,6 +1199,7 @@
 	      <property name="label">gtk-help</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-11</property>
 	    </widget>
 	  </child>
@@ -1132,6 +1212,7 @@
 	      <property name="label" translatable="yes">_Credits</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 	    </widget>
 	  </child>
@@ -1145,6 +1226,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
@@ -1183,7 +1265,7 @@
 	    <widget class="GtkLabel" id="zenity_about_version">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="no">zenity_about_version</property>
+	      <property name="label" translatable="yes">zenity_about_version</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1205,7 +1287,7 @@
 	    <widget class="GtkLabel" id="zenity_about_description">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="no">zenity_about_description</property>
+	      <property name="label" translatable="yes">zenity_about_description</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1227,7 +1309,7 @@
 	    <widget class="GtkLabel" id="zenity_about_copyright">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="no">zenity_about_copyright</property>
+	      <property name="label" translatable="yes">zenity_about_copyright</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>