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

script: Do not overwrite ObjectInfo fields

Browse Source 
When merging multiple definitions it's possible that the ObjectInfo
fields may get overwritten. Instead of trampling over the fields, we
should reset them only when they actually change — especially the
"is_actor" one, which controls the destruction of the objects when
unmerging happens.

https://bugzilla.gnome.org/show_bug.cgi?id=669743
This commit is contained in:
Emmanuele Bassi 2014-12-14 23:05:17 +00:00
parent e6a60f6617
commit d005c6a880
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clutter/clutter-script-parser.c
View File

@ -1083,6 +1083,7 @@ clutter_script_parser_object_end (JsonParser *json_parser,
oinfo = g_slice_new0 (ObjectInfo); oinfo = g_slice_new0 (ObjectInfo);
oinfo->merge_id = _clutter_script_get_last_merge_id (script); oinfo->merge_id = _clutter_script_get_last_merge_id (script);
oinfo->id = g_strdup (id_); oinfo->id = g_strdup (id_);
oinfo->has_unresolved = TRUE;
class_name = json_object_get_string_member (object, "type"); class_name = json_object_get_string_member (object, "type");
oinfo->class_name = g_strdup (class_name); oinfo->class_name = g_strdup (class_name);
@ -1107,6 +1108,8 @@ clutter_script_parser_object_end (JsonParser *json_parser,
oinfo->children = parse_children (oinfo, val); oinfo->children = parse_children (oinfo, val);
json_object_remove_member (object, "children"); json_object_remove_member (object, "children");
oinfo->has_unresolved = TRUE;
} }
if (json_object_has_member (object, "signals")) if (json_object_has_member (object, "signals"))
@ -1115,9 +1118,9 @@ clutter_script_parser_object_end (JsonParser *json_parser,
oinfo->signals = parse_signals (script, oinfo, val); oinfo->signals = parse_signals (script, oinfo, val);
json_object_remove_member (object, "signals"); json_object_remove_member (object, "signals");
}
oinfo->is_actor = FALSE; oinfo->has_unresolved = TRUE;
}
if (strcmp (oinfo->class_name, "ClutterStage") == 0 && if (strcmp (oinfo->class_name, "ClutterStage") == 0 &&
json_object_has_member (object, "is-default")) json_object_has_member (object, "is-default"))
@ -1132,9 +1135,6 @@ clutter_script_parser_object_end (JsonParser *json_parser,
else else
oinfo->is_stage_default = FALSE; oinfo->is_stage_default = FALSE;
oinfo->is_unmerged = FALSE;
oinfo->has_unresolved = TRUE;
members = json_object_get_members (object); members = json_object_get_members (object);
for (l = members; l; l = l->next) for (l = members; l; l = l->next)
{ {
@ -1175,6 +1175,7 @@ clutter_script_parser_object_end (JsonParser *json_parser,
pinfo->is_layout = g_str_has_prefix (name, "layout::") ? TRUE : FALSE; pinfo->is_layout = g_str_has_prefix (name, "layout::") ? TRUE : FALSE;
oinfo->properties = g_list_prepend (oinfo->properties, pinfo); oinfo->properties = g_list_prepend (oinfo->properties, pinfo);
oinfo->has_unresolved = TRUE;
} }
g_list_free (members); g_list_free (members);
@ -2169,12 +2170,12 @@ _clutter_script_construct_object (ClutterScript *script,
if (G_UNLIKELY (oinfo->gtype == G_TYPE_INVALID)) if (G_UNLIKELY (oinfo->gtype == G_TYPE_INVALID))
return; return;
oinfo->is_actor = g_type_is_a (oinfo->gtype, CLUTTER_TYPE_ACTOR);
if (oinfo->is_actor)
oinfo->is_stage = g_type_is_a (oinfo->gtype, CLUTTER_TYPE_STAGE);
} }
oinfo->is_actor = g_type_is_a (oinfo->gtype, CLUTTER_TYPE_ACTOR);
if (oinfo->is_actor)
oinfo->is_stage = g_type_is_a (oinfo->gtype, CLUTTER_TYPE_STAGE);
if (oinfo->is_stage && oinfo->is_stage_default) if (oinfo->is_stage && oinfo->is_stage_default)
{ {
ClutterStageManager *manager = clutter_stage_manager_get_default (); ClutterStageManager *manager = clutter_stage_manager_get_default ();