From 0484ef142d5d603c9f1d69ea5ebeda80bd2af171 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 12 Jan 2015 21:23:42 +0100 Subject: [PATCH] MetaWindow: Change icon properties to be of pointer type Follow up to commit af7f51b992b20da543312fa9fdf1dcef39704b37 . https://bugzilla.gnome.org/show_bug.cgi?id=742824 --- src/core/window.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/core/window.c b/src/core/window.c index 1db350619..f5bc71182 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -312,10 +312,10 @@ meta_window_get_property(GObject *object, g_value_set_string (value, win->title); break; case PROP_ICON: - g_value_set_object (value, win->icon); + g_value_set_pointer (value, win->icon); break; case PROP_MINI_ICON: - g_value_set_object (value, win->mini_icon); + g_value_set_pointer (value, win->mini_icon); break; case PROP_DECORATED: g_value_set_boolean (value, win->decorated); @@ -427,17 +427,15 @@ meta_window_class_init (MetaWindowClass *klass) NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_props[PROP_ICON] = - g_param_spec_object ("icon", - "Icon", - "96 pixel sized icon", - GDK_TYPE_PIXBUF, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_pointer ("icon", + "Icon", + "96 pixel sized icon", + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_props[PROP_MINI_ICON] = - g_param_spec_object ("mini-icon", - "Mini Icon", - "16 pixel sized icon", - GDK_TYPE_PIXBUF, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_pointer ("mini-icon", + "Mini Icon", + "16 pixel sized icon", + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_props[PROP_DECORATED] = g_param_spec_boolean ("decorated", "Decorated",