From 561d1c6358333732bbd11040d7fefa2a0c04031a Mon Sep 17 00:00:00 2001 From: Jehan Date: Wed, 17 Jul 2013 19:05:21 +0900 Subject: [PATCH] gtkdialog - more informative warning when ordering unexisting response_id (cherry picked from commit 0e4d9b7793c16fd98b396ffe6b8db48b8e09f1d2) --- gtk/gtkdialog.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index a2c03185fa..a2756f68bd 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -1243,7 +1243,11 @@ gtk_dialog_set_alternative_button_order_valist (GtkDialog *dialog, { /* reorder child with response_id to position */ child = dialog_find_button (dialog, response_id); - gtk_box_reorder_child (GTK_BOX (dialog->action_area), child, position); + if (child != NULL) + gtk_box_reorder_child (GTK_BOX (dialog->action_area), child, position); + else + g_warning ("%s : no child button with response id %d.", G_STRFUNC, + response_id); response_id = va_arg (args, gint); position++; @@ -1353,7 +1357,11 @@ gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog, { /* reorder child with response_id to position */ child = dialog_find_button (dialog, new_order[position]); - gtk_box_reorder_child (GTK_BOX (dialog->action_area), child, position); + if (child != NULL) + gtk_box_reorder_child (GTK_BOX (dialog->action_area), child, position); + else + g_warning ("%s : no child button with response id %d.", G_STRFUNC, + new_order[position]); } }