From 049cc6aa013601c4e662c38df408f8956b155f0a Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 22 Jan 2017 22:58:45 +0100 Subject: image: Change getters Instead of returning the icon size with them, make gtk_image_get_icon_name() and gtk_image_get_gicon() only return the icon itself. As a benefit, we can turn them into regular getters that return values instead of requiring out parameters. Instead, provide gtk_image_get_icon_size() to query the icon size. --- gtk/gtkaboutdialog.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gtk/gtkaboutdialog.c') diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 56c0c17e77..bfab623f2a 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -961,12 +961,7 @@ gtk_about_dialog_get_property (GObject *object, break; case PROP_LOGO_ICON_NAME: if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME) - { - const gchar *icon_name; - - gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL); - g_value_set_string (value, icon_name); - } + g_value_set_string (value, gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image))); else g_value_set_string (value, NULL); break; @@ -1862,16 +1857,15 @@ const gchar * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv; - const gchar *icon_name = NULL; g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); priv = about->priv; - if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME) - gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL); + if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) != GTK_IMAGE_ICON_NAME) + return NULL; - return icon_name; + return gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image)); } /** -- cgit v1.2.1