AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-18 16:10:08 +00:00
Code Issues Projects Releases Wiki Activity

aboutdialog: Clean up for logo being a texture

Browse Source
This commit is contained in:
Benjamin Otte 2017-11-05 06:50:28 +01:00
parent 22472c1924
commit e8b2493680
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkaboutdialog.c
View File

@ -575,11 +575,11 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
* Since: 2.6 * Since: 2.6
*/ */
props[PROP_LOGO] = props[PROP_LOGO] =
g_param_spec_boxed ("logo", g_param_spec_object ("logo",
P_("Logo"), P_("Logo"),
P_("A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"), P_("A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"),
GDK_TYPE_TEXTURE, GDK_TYPE_TEXTURE,
GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
/** /**
* GtkAboutDialog:logo-icon-name: * GtkAboutDialog:logo-icon-name:
@ -955,9 +955,9 @@ gtk_about_dialog_get_property (GObject *object,
break; break;
case PROP_LOGO: case PROP_LOGO:
if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_TEXTURE) if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_TEXTURE)
g_value_set_boxed (value, gtk_image_get_texture (GTK_IMAGE (priv->logo_image))); g_value_set_object (value, gtk_image_get_texture (GTK_IMAGE (priv->logo_image)));
else else
g_value_set_boxed (value, NULL); g_value_set_object (value, NULL);
break; break;
case PROP_LOGO_ICON_NAME: case PROP_LOGO_ICON_NAME:
if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME) if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
@ -1817,7 +1817,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about,
GtkAboutDialogPrivate *priv; GtkAboutDialogPrivate *priv;
g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
g_return_if_fail (GDK_IS_TEXTURE (logo)); g_return_if_fail (logo == NULL || GDK_IS_TEXTURE (logo));
priv = about->priv; priv = about->priv;