From 7054ddccd816256894bb048e4937a44f332137fb Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 15 Dec 2003 21:47:50 +0000 Subject: [PATCH] Removed. (gtk_dialog_close): Don't call dialog_has_cancel(). At least 2003-12-15 Federico Mena Quintero * gtk/gtkdialog.c (dialog_has_cancel): Removed. (gtk_dialog_close): Don't call dialog_has_cancel(). At least allows sane behavior for #101293. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkdialog.c | 27 --------------------------- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index afcd1e382f..eb1b61da3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-12-15 Federico Mena Quintero + + * gtk/gtkdialog.c (dialog_has_cancel): Removed. + (gtk_dialog_close): Don't call dialog_has_cancel(). At least + allows sane behavior for #101293. + Mon Dec 15 00:56:54 2003 Matthias Clasen * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index afcd1e382f..eb1b61da3a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2003-12-15 Federico Mena Quintero + + * gtk/gtkdialog.c (dialog_has_cancel): Removed. + (gtk_dialog_close): Don't call dialog_has_cancel(). At least + allows sane behavior for #101293. + Mon Dec 15 00:56:54 2003 Matthias Clasen * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index afcd1e382f..eb1b61da3a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2003-12-15 Federico Mena Quintero + + * gtk/gtkdialog.c (dialog_has_cancel): Removed. + (gtk_dialog_close): Don't call dialog_has_cancel(). At least + allows sane behavior for #101293. + Mon Dec 15 00:56:54 2003 Matthias Clasen * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index afcd1e382f..eb1b61da3a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2003-12-15 Federico Mena Quintero + + * gtk/gtkdialog.c (dialog_has_cancel): Removed. + (gtk_dialog_close): Don't call dialog_has_cancel(). At least + allows sane behavior for #101293. + Mon Dec 15 00:56:54 2003 Matthias Clasen * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index afcd1e382f..eb1b61da3a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2003-12-15 Federico Mena Quintero + + * gtk/gtkdialog.c (dialog_has_cancel): Removed. + (gtk_dialog_close): Don't call dialog_has_cancel(). At least + allows sane behavior for #101293. + Mon Dec 15 00:56:54 2003 Matthias Clasen * gtk/gtkbutton.[hc]: Add new properties, xalign and yalign, with diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 7f81f9d83d..fb4ca8bec0 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -354,30 +354,6 @@ gtk_dialog_style_set (GtkWidget *widget, update_spacings (GTK_DIALOG (widget)); } -static gboolean -dialog_has_cancel (GtkDialog *dialog) -{ - GList *children, *tmp_list; - gboolean ret = FALSE; - - children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area)); - - for (tmp_list = children; tmp_list; tmp_list = tmp_list->next) - { - ResponseData *rd = get_response_data (tmp_list->data); - - if (rd && rd->response_id == GTK_RESPONSE_CANCEL) - { - ret = TRUE; - break; - } - } - - g_list_free (children); - - return ret; -} - static void gtk_dialog_close (GtkDialog *dialog) { @@ -386,9 +362,6 @@ gtk_dialog_close (GtkDialog *dialog) GtkWidget *widget = GTK_WIDGET (dialog); GdkEvent *event; - if (!dialog_has_cancel (dialog)) - return; - event = gdk_event_new (GDK_DELETE); event->any.window = g_object_ref (widget->window);