r15171 - gnucash/branches/2.0 - Remove "closing last window" confirmation dialog and corresponding

Derek Atkins warlord at cvs.gnucash.org
Sat Dec 2 21:01:56 EST 2006


Author: warlord
Date: 2006-12-02 21:01:54 -0500 (Sat, 02 Dec 2006)
New Revision: 15171
Trac: http://svn.gnucash.org/trac/changeset/15171

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c
Log:
Remove "closing last window" confirmation dialog and corresponding
warning (reverting r14580). Fixes #355392.

Merge from r14944



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:13625
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:13656
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-12-03 01:40:32 UTC (rev 15170)
+++ gnucash/branches/2.0/ChangeLog	2006-12-03 02:01:54 UTC (rev 15171)
@@ -68,6 +68,9 @@
 	therefore crashes on Solaris and Windows. r14675 had fixed that, r14945
 	(me) undermined it though.   (#378881).
 
+	Remove "closing last window" confirmation dialog and corresponding
+	warning (reverting r14580). Fixes #355392.
+
 2006-09-26  Andreas Köhler  <andi5.py at gmx.net>
 
 	Handle type-compatibility when reparenting accounts: #344966.

Modified: gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c	2006-12-03 01:40:32 UTC (rev 15170)
+++ gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c	2006-12-03 02:01:54 UTC (rev 15171)
@@ -982,13 +982,6 @@
 {
   static gboolean already_dead = FALSE;
   QofSession *session;
-  GtkWidget *dialog;
-  gint response;
-  const gchar *title = _("Quit GnuCash?");
-  const gchar *message =_("You are attempting to close the last "
-			  "GnuCash window.  Doing so will quit the "
-			  "application.  Are you sure that this is "
-			  "what you want to do?");
 
   if (already_dead)
     return TRUE;
@@ -1012,26 +1005,10 @@
     return TRUE;
   }
 
-  dialog = gtk_message_dialog_new(GTK_WINDOW(window),
-				  GTK_DIALOG_MODAL,
-				  GTK_MESSAGE_WARNING,
-				  GTK_BUTTONS_NONE,
-				  "%s", title);
-  gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-					   "%s", message);
-  gtk_dialog_add_buttons(GTK_DIALOG(dialog),
-			 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-			 GTK_STOCK_QUIT, GTK_RESPONSE_OK,
-			 NULL);
-  gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy(dialog);
+  /* Tell gnucash to shutdown cleanly */
+  g_timeout_add(250, gnc_main_window_timed_quit, NULL);
+  already_dead = TRUE;
 
-  if (response == GTK_RESPONSE_OK) {
-    /* Tell gnucash to shutdown cleanly */
-    g_timeout_add(250, gnc_main_window_timed_quit, NULL);
-    already_dead = TRUE;
-  }
   return TRUE;
 }
 



More information about the gnucash-changes mailing list