From 5d8adc940630cfdb9f347521817863bc75528b5f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 8 Oct 2008 02:27:07 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20555270=20=E2=80=93=20Allow=20unsetting=20?= =?UTF-8?q?a=20MessageDialog's=20image?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-10-08 Christian Dywan Bug 555270 – Allow unsetting a MessageDialog's image * gtk/gtkmessagedialog.c (gtk_message_dialog_set_property), Remove a superfluous cast to GtkWidget* (gtk_message_dialog_set_image): Accept NULL for the image and unset the image in that case. svn path=/trunk/; revision=21607 --- ChangeLog | 9 +++++++++ gtk/gtkmessagedialog.c | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1cf64d5a89..61dac2f26a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-10-08 Christian Dywan + + Bug 555270 – Allow unsetting a MessageDialog's image + + * gtk/gtkmessagedialog.c (gtk_message_dialog_set_property), + Remove a superfluous cast to GtkWidget* + (gtk_message_dialog_set_image): Accept NULL for the image + and unset the image in that case. + 2008-10-08 Christian Dywan Bug 436533 – Allow more space efficient scroll arrows placement diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index ca8356018b..ecae119220 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -418,7 +418,7 @@ gtk_message_dialog_set_property (GObject *object, g_value_get_boolean (value)); break; case PROP_IMAGE: - gtk_message_dialog_set_image (dialog, (GtkWidget *)g_value_get_object (value)); + gtk_message_dialog_set_image (dialog, g_value_get_object (value)); break; default: @@ -628,6 +628,13 @@ gtk_message_dialog_set_image (GtkMessageDialog *dialog, GtkWidget *parent; g_return_if_fail (GTK_IS_MESSAGE_DIALOG (dialog)); + g_return_if_fail (image == NULL || GTK_IS_WIDGET (image)); + + if (image == NULL) + { + image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); + } priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);