brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MetaWindow: Change icon properties to be of pointer type

Browse Source 
Follow up to commit af7f51b992 .

https://bugzilla.gnome.org/show_bug.cgi?id=742824
This commit is contained in:
Rui Matos 2015-01-12 21:23:42 +01:00
parent 6609d9c6a4
commit 0484ef142d
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/window.c
View File

@ -312,10 +312,10 @@ meta_window_get_property(GObject *object,
g_value_set_string (value, win->title); g_value_set_string (value, win->title);
break; break;
case PROP_ICON: case PROP_ICON:
g_value_set_object (value, win->icon); g_value_set_pointer (value, win->icon);
break; break;
case PROP_MINI_ICON: case PROP_MINI_ICON:
g_value_set_object (value, win->mini_icon); g_value_set_pointer (value, win->mini_icon);
break; break;
case PROP_DECORATED: case PROP_DECORATED:
g_value_set_boolean (value, win->decorated); g_value_set_boolean (value, win->decorated);
@ -427,17 +427,15 @@ meta_window_class_init (MetaWindowClass *klass)
NULL, NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
obj_props[PROP_ICON] = obj_props[PROP_ICON] =
g_param_spec_object ("icon", g_param_spec_pointer ("icon",
"Icon", "Icon",
"96 pixel sized icon", "96 pixel sized icon",
GDK_TYPE_PIXBUF, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
obj_props[PROP_MINI_ICON] = obj_props[PROP_MINI_ICON] =
g_param_spec_object ("mini-icon", g_param_spec_pointer ("mini-icon",
"Mini Icon", "Mini Icon",
"16 pixel sized icon", "16 pixel sized icon",
GDK_TYPE_PIXBUF, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
obj_props[PROP_DECORATED] = obj_props[PROP_DECORATED] =
g_param_spec_boolean ("decorated", g_param_spec_boolean ("decorated",
"Decorated", "Decorated",