Don't make this conditional on having a GTK_RESPONSE_CANCEL button -> end

2006-04-26  Federico Mena Quintero  <federico@novell.com>

	* gtk/gtkdialog.c (gtk_dialog_close): Don't make this conditional
	on having a GTK_RESPONSE_CANCEL button -> end the idiocy.  Fixes
	bug #101293.

diff --git a/ChangeLog b/ChangeLog
index af012321110b10ba97f62409246937d5e834048f..a164575957032c00fd25e806e84b9fc97c136a07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-26  Federico Mena Quintero  <federico@novell.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_close): Don't make this conditional
+       on having a GTK_RESPONSE_CANCEL button -> end the idiocy.  Fixes
+       bug #101293.
+
 2006-04-26  Kristian Rietveld  <kris@imendio.com>
 
        * gtk/gtktreeview.c (node_is_visible): new function,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index af012321110b10ba97f62409246937d5e834048f..a164575957032c00fd25e806e84b9fc97c136a07 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-04-26  Federico Mena Quintero  <federico@novell.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_close): Don't make this conditional
+       on having a GTK_RESPONSE_CANCEL button -> end the idiocy.  Fixes
+       bug #101293.
+
 2006-04-26  Kristian Rietveld  <kris@imendio.com>
 
        * gtk/gtktreeview.c (node_is_visible): new function,

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index a04be42029affb37792547f03a8889d78d9d8f6f..5a96fc73c61a2397a39291acbbb6aa3201c008b2 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -423,9 +423,6 @@ gtk_dialog_close (GtkDialog *dialog)
   GtkWidget *widget = GTK_WIDGET (dialog);
   GdkEvent *event;
 
-  if (!dialog_find_button (dialog, GTK_RESPONSE_CANCEL))
-    return;
-
   event = gdk_event_new (GDK_DELETE);
   
   event->any.window = g_object_ref (widget->window);