r15504 - gnucash/branches/2.0 - Do not crash on delete_event in new user dialog. Fix #401484.

Derek Atkins warlord at cvs.gnucash.org
Sun Feb 4 16:47:04 EST 2007


Author: warlord
Date: 2007-02-04 16:47:03 -0500 (Sun, 04 Feb 2007)
New Revision: 15504
Trac: http://svn.gnucash.org/trac/changeset/15504

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/gnome/dialog-new-user.c
Log:
Do not crash on delete_event in new user dialog. Fix #401484.

If the new user dialog is closed with the help of the window manager,
the delete_event is not handled and g_assert_not_reached() is reached by
the code. Treat it like a click on "Cancel" instead.

Merge from r15459



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13993
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:14052
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2007-02-04 21:21:10 UTC (rev 15503)
+++ gnucash/branches/2.0/ChangeLog	2007-02-04 21:47:03 UTC (rev 15504)
@@ -1,3 +1,12 @@
+2007-02-04  Andreas Köhler  <andi5.py at gmx.net>
+
+	Do not crash on delete_event in new user dialog. Fix #401484.
+
+	If the new user dialog is closed with the help of the window
+	manager, the delete_event is not handled and
+	g_assert_not_reached() is reached by the code. Treat it like a
+	click on "Cancel" instead.
+
 2007-02-02  Christian Stimming <stimming at tuhh.de>
 
 	* accounts/fr_CA/*: Added Canadian French account templates by

Modified: gnucash/branches/2.0/src/gnome/dialog-new-user.c
===================================================================
--- gnucash/branches/2.0/src/gnome/dialog-new-user.c	2007-02-04 21:21:10 UTC (rev 15503)
+++ gnucash/branches/2.0/src/gnome/dialog-new-user.c	2007-02-04 21:47:03 UTC (rev 15504)
@@ -99,6 +99,7 @@
   result = gtk_dialog_run (GTK_DIALOG (dialog));
   switch (result) {
 	  case GTK_RESPONSE_CANCEL:
+	  case GTK_RESPONSE_DELETE_EVENT:
 		gnc_ui_new_user_cancel_dialog ();
 		break;
 	  case GTK_RESPONSE_OK:



More information about the gnucash-changes mailing list