From 9cb85c5eb1b0e041f4b7b7f1c5ab9cce55de524f Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 30 Dec 2006 23:30:32 +0000
Subject: [PATCH] Updated the about box to work properly with Gtk+2.10

---
 glade.patch              | 26 +++++++++++++-------------
 src/ui/gui/about.c       |  9 ++++++++-
 src/ui/gui/psppire.glade |  4 +---
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/glade.patch b/glade.patch
index dc143a9d..d4a01e7c 100644
--- a/glade.patch
+++ b/glade.patch
@@ -1,10 +1,10 @@
-This patch mitigates a bug in glade-2, which silently deletes stock_ids, which it
-thinks are not valid.   You may have to apply this patch after editing data-editor.glade
-with glade-2
-==============
---- src/ui/gui/data-editor.glade,old	2006-12-23 17:30:32.000000000 +0900
-+++ src/ui/gui/data-editor.glade	2006-12-23 17:30:36.000000000 +0900
-@@ -619,6 +619,7 @@
+This patch mitigates a bug in glade-2, which silently deletes stock_ids, which 
+it thinks are not valid.   You may have to apply this patch after editing 
+data-editor.glade with glade-2.  Glade-3 is another story and might give 
+problems of its own.
+--- src/ui/gui/data-editor.glade,old	2006-12-31 07:29:39.000000000 +0900
++++ src/ui/gui/data-editor.glade	2006-12-31 07:30:04.000000000 +0900
+@@ -653,6 +653,7 @@
  		  <property name="visible">True</property>
  		  <property name="sensitive">False</property>
  		  <property name="tooltip" translatable="yes">Variables</property>
@@ -12,7 +12,7 @@ with glade-2
  		  <property name="label" translatable="yes"></property>
  		  <property name="use_underline">True</property>
  		  <property name="visible_horizontal">True</property>
-@@ -678,6 +679,7 @@
+@@ -712,6 +713,7 @@
  		  <property name="visible">True</property>
  		  <property name="sensitive">False</property>
  		  <property name="tooltip" translatable="yes">Insert Case</property>
@@ -20,7 +20,7 @@ with glade-2
  		  <property name="label" translatable="yes"></property>
  		  <property name="use_underline">True</property>
  		  <property name="visible_horizontal">True</property>
-@@ -696,6 +698,7 @@
+@@ -730,6 +732,7 @@
  		  <property name="visible">True</property>
  		  <property name="sensitive">False</property>
  		  <property name="tooltip" translatable="yes">Insert Variable</property>
@@ -28,7 +28,7 @@ with glade-2
  		  <property name="label" translatable="yes"></property>
  		  <property name="use_underline">True</property>
  		  <property name="visible_horizontal">True</property>
-@@ -726,6 +729,7 @@
+@@ -760,6 +763,7 @@
  		  <property name="visible">True</property>
  		  <property name="sensitive">False</property>
  		  <property name="tooltip" translatable="yes">Split File</property>
@@ -36,7 +36,7 @@ with glade-2
  		  <property name="label" translatable="yes"></property>
  		  <property name="use_underline">True</property>
  		  <property name="visible_horizontal">True</property>
-@@ -743,6 +747,7 @@
+@@ -777,6 +781,7 @@
  		  <property name="visible">True</property>
  		  <property name="sensitive">False</property>
  		  <property name="tooltip" translatable="yes">Weight Cases</property>
@@ -44,7 +44,7 @@ with glade-2
  		  <property name="label" translatable="yes"></property>
  		  <property name="use_underline">True</property>
  		  <property name="visible_horizontal">True</property>
-@@ -760,6 +765,7 @@
+@@ -794,6 +799,7 @@
  		  <property name="visible">True</property>
  		  <property name="sensitive">False</property>
  		  <property name="tooltip" translatable="yes">Select Cases</property>
@@ -52,7 +52,7 @@ with glade-2
  		  <property name="label" translatable="yes"></property>
  		  <property name="use_underline">True</property>
  		  <property name="visible_horizontal">True</property>
-@@ -789,6 +795,7 @@
+@@ -823,6 +829,7 @@
  		<widget class="GtkToggleToolButton" id="togglebutton-value-labels">
  		  <property name="visible">True</property>
  		  <property name="tooltip" translatable="yes">Value Labels</property>
diff --git a/src/ui/gui/about.c b/src/ui/gui/about.c
index 7526f968..7ab9a288 100644
--- a/src/ui/gui/about.c
+++ b/src/ui/gui/about.c
@@ -21,6 +21,11 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   gtk_window_set_icon_from_file (GTK_WINDOW (about),
 				 PKGDATADIR "/psppicon.png", 0);
 
+  gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about),
+				"http://www.gnu.org/software/pspp");
+
+  gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about),
+				bare_version);
 
   gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about),
 				(const gchar **) authors);
@@ -32,6 +37,8 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   gtk_window_set_keep_above (GTK_WINDOW (about), TRUE);
 
 
-  gtk_widget_show (about);
+  gtk_dialog_run (about);
+
+  gtk_widget_hide (about);
 }
 
diff --git a/src/ui/gui/psppire.glade b/src/ui/gui/psppire.glade
index d8a9bbee..a8bee600 100644
--- a/src/ui/gui/psppire.glade
+++ b/src/ui/gui/psppire.glade
@@ -7,7 +7,7 @@
   <property name="destroy_with_parent">False</property>
   <property name="name">PSPPire</property>
   <property name="copyright">Free Software Foundation</property>
-  <property name="comments" translatable="yes">This is pre-alpha software.  It probably will not work.</property>
+  <property name="comments" translatable="yes">This is pre-alpha software.  Use at your own risk.</property>
   <property name="license" translatable="yes">    This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -24,8 +24,6 @@
     02110-1301, USA.
 </property>
   <property name="wrap_license">False</property>
-  <property name="website">http://www.gnu.org/software/pspp</property>
-  <property name="authors">John Darrington</property>
   <property name="artists">Patrick Brunier</property>
   <property name="translator_credits"></property>
   <property name="logo">pspplogo.png</property>
-- 
2.30.2