From 83d3ce6535c3ebdcf1a06405b703a2917a862e12 Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@src.gnome.org>
Date: Sun, 15 Mar 1998 03:15:35 +0000
Subject: [PATCH] handle WM delete of toolbox correctly. (gdisplay_delete):
 don't close

        * app/interface.c (toolbox_delete): handle WM delete of toolbox
        correctly.
        (gdisplay_delete): don't close image window without confirmation.
-timj
---
 ChangeLog                           | 6 ++++++
 app/app_procs.c                     | 4 ++--
 app/display/gimpdisplay-ops.c       | 4 ++--
 app/display/gimpdisplayshell-draw.c | 6 +++---
 app/display/gimpdisplayshell.c      | 6 +++---
 app/gdisplay_ops.c                  | 4 ++--
 app/interface.c                     | 6 +++---
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d88eb477d..8aebc9f2af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar 15 03:54:58 1998  Tim Janik  <timj@gimp.org>
+
+	* app/interface.c (toolbox_delete): handle WM delete of toolbox
+	correctly.
+	(gdisplay_delete): don't close image window without confirmation.
+
 Sat Mar 14 18:38:26 PST 1998 Manish Singh <yosh@gimp.org>
 
         * app/iscissors.c: new, improved, still buggy iscissors!
diff --git a/app/app_procs.c b/app/app_procs.c
index e64db71c60..34b5f05720 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -572,7 +572,7 @@ really_quit_callback (GtkButton *button,
 }
 
 static void
-really_quit_cancel_callback (GtkButton *button,
+really_quit_cancel_callback (GtkWidget *widget,
 			     GtkWidget *dialog)
 {
   menus_set_sensitive ("<Toolbox>/File/Quit", TRUE);
@@ -585,7 +585,7 @@ really_quit_delete_callback (GtkWidget *widget,
 			     GdkEvent  *event,
 			     gpointer client_data) 
 {
-  really_quit_cancel_callback (GTK_BUTTON(widget), (GtkWidget *) client_data);
+  really_quit_cancel_callback (widget, (GtkWidget *) client_data);
 
   return TRUE;
 }
diff --git a/app/display/gimpdisplay-ops.c b/app/display/gimpdisplay-ops.c
index 0d305eee81..774fe59699 100644
--- a/app/display/gimpdisplay-ops.c
+++ b/app/display/gimpdisplay-ops.c
@@ -287,9 +287,9 @@ gdisplay_delete_warning_callback (GtkWidget *widget,
 				  GdkEvent  *event,
 				  gpointer  client_data)
 {
-  gdisplay_cancel_warning_callback (widget, client_data);
+  menus_set_sensitive ("<Image>/File/Close", TRUE);
 
-  return TRUE;
+  return FALSE;
 }
 
 static void
diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c
index fa806744a9..6e3d958737 100644
--- a/app/display/gimpdisplayshell-draw.c
+++ b/app/display/gimpdisplayshell-draw.c
@@ -227,9 +227,9 @@ tools_button_press (GtkWidget      *w,
 static gint
 toolbox_delete (GtkWidget *w, GdkEvent *e, gpointer data)
 {
-  app_exit (FALSE);
+  app_exit (0);
 
-  return FALSE;
+  return TRUE;
 }
 
 static void
@@ -252,7 +252,7 @@ gdisplay_delete (GtkWidget *w,
 {
   gdisplay_close_window (gdisp, FALSE);
 
-  return FALSE;
+  return TRUE;
 }
 
 static void
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index fa806744a9..6e3d958737 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -227,9 +227,9 @@ tools_button_press (GtkWidget      *w,
 static gint
 toolbox_delete (GtkWidget *w, GdkEvent *e, gpointer data)
 {
-  app_exit (FALSE);
+  app_exit (0);
 
-  return FALSE;
+  return TRUE;
 }
 
 static void
@@ -252,7 +252,7 @@ gdisplay_delete (GtkWidget *w,
 {
   gdisplay_close_window (gdisp, FALSE);
 
-  return FALSE;
+  return TRUE;
 }
 
 static void
diff --git a/app/gdisplay_ops.c b/app/gdisplay_ops.c
index 0d305eee81..774fe59699 100644
--- a/app/gdisplay_ops.c
+++ b/app/gdisplay_ops.c
@@ -287,9 +287,9 @@ gdisplay_delete_warning_callback (GtkWidget *widget,
 				  GdkEvent  *event,
 				  gpointer  client_data)
 {
-  gdisplay_cancel_warning_callback (widget, client_data);
+  menus_set_sensitive ("<Image>/File/Close", TRUE);
 
-  return TRUE;
+  return FALSE;
 }
 
 static void
diff --git a/app/interface.c b/app/interface.c
index fa806744a9..6e3d958737 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -227,9 +227,9 @@ tools_button_press (GtkWidget      *w,
 static gint
 toolbox_delete (GtkWidget *w, GdkEvent *e, gpointer data)
 {
-  app_exit (FALSE);
+  app_exit (0);
 
-  return FALSE;
+  return TRUE;
 }
 
 static void
@@ -252,7 +252,7 @@ gdisplay_delete (GtkWidget *w,
 {
   gdisplay_close_window (gdisp, FALSE);
 
-  return FALSE;
+  return TRUE;
 }
 
 static void