r14944 - gnucash/trunk - Remove "closing last window" confirmation dialog and corresponding

[Andreas Köhler]

Author: andi5
Date: 2006-10-09 12:45:40 -0400 (Mon, 09 Oct 2006)
New Revision: 14944
Trac: http://svn.gnucash.org/trac/changeset/14944

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



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:694
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13379
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:704
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13379
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas.in
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas.in	2006-10-09 13:41:04 UTC (rev 14943)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas.in	2006-10-09 16:45:40 UTC (rev 14944)
@@ -16,19 +16,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnucash/general/warnings/close_last_window</key>
-      <applyto>/apps/gnucash/general/warnings/permanent/close_last_window</applyto>
-      <applyto>/apps/gnucash/general/warnings/temporary/close_last_window</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Exit GnuCash</short>
-        <long>This dialog is presented when you attempt to close the last GnuCash window.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnucash/general/warnings/mark_split_unreconciled</key>
       <applyto>/apps/gnucash/general/warnings/permanent/mark_split_unreconciled</applyto>
       <applyto>/apps/gnucash/general/warnings/temporary/mark_split_unreconciled</applyto>

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2006-10-09 13:41:04 UTC (rev 14943)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2006-10-09 16:45:40 UTC (rev 14944)
@@ -997,13 +997,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;
@@ -1027,26 +1020,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 = gnc_dialog_run (GTK_DIALOG (dialog), "close_last_window");
-  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;
 }