[pioneers] * Thu Aug 5 2010 Paul W. Frields <stickster at gmail.com> - 0.12.3-2 - Fix callback for name changes (

[Paul W. Frields]

commit f06d910b7e80d6fe52c504458358446e068a1d8d
Author: Paul W. Frields <stickster at gmail.com>
Date:   Thu Aug 5 10:27:21 2010 -0400

    * Thu Aug  5 2010 Paul W. Frields <stickster at gmail.com> - 0.12.3-2
    - Fix callback for name changes (#594858)

 pioneers-0.12.2-namechange.patch |   12 ++++++++++++
 pioneers.spec                    |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/pioneers-0.12.2-namechange.patch b/pioneers-0.12.2-namechange.patch
new file mode 100644
index 0000000..a1b30b0
--- /dev/null
+++ b/pioneers-0.12.2-namechange.patch
@@ -0,0 +1,12 @@
+diff -uNr pioneers-0.12.2-orig/client/gtk/name.c pioneers-0.12.2/client/gtk/name.c
+--- pioneers-0.12.2-orig/client/gtk/name.c	2008-05-01 15:05:57.000000000 -0400
++++ pioneers-0.12.2/client/gtk/name.c	2010-08-01 17:29:58.284181851 -0400
+@@ -47,7 +47,7 @@
+ 			   gpointer user_data)
+ {
+ 	DialogData *dialog = user_data;
+-	if (response_id == GTK_RESPONSE_OK) {
++	if ((response_id == GTK_RESPONSE_OK) && (callback_mode != MODE_INIT)) {
+ 		const gchar *new_name =
+ 		    gtk_entry_get_text(GTK_ENTRY(dialog->name_entry));
+ 		const gchar *new_style = dialog->current_style;
diff --git a/pioneers.spec b/pioneers.spec
index f22b456..2ee4f68 100644
--- a/pioneers.spec
+++ b/pioneers.spec
@@ -1,6 +1,6 @@
 Name:           pioneers
 Version:        0.12.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turnbased board strategy game (colonize an island)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -8,6 +8,7 @@ URL:            http://pio.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pio/%{name}-%{version}.tar.gz
 Patch0:         pioneers-0.12.1-sanitize.patch
 Patch1:		pioneers-0.12.3-dso.patch
+Patch2:		pioneers-0.12.2-namechange.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnome-devel gtk2-devel gettext scrollkeeper intltool
 BuildRequires:  perl(XML::Parser) desktop-file-utils
@@ -42,6 +43,7 @@ edited graphically.
 %setup -q
 %patch0 -p1 -z .sanitize
 %patch1 -p1 -z .dso
+%patch2 -p1 -z .namechange
 	
 
 %build
@@ -111,6 +113,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Thu Aug  5 2010 Paul W. Frields <stickster at gmail.com> - 0.12.3-2
+- Fix callback for name changes (#594858)
+
 * Mon Feb 15 2010 Paul W. Frields <stickster at gmail.com> - 0.12.3-1
 - New upstream release 0.12.3
 - Add patch for new default linker DSO behavior