isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-31 07:33:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cally: Drop use of deprecated macros

Browse Source 
Use the equivalent functions instead.
This commit is contained in:
Emmanuele Bassi 2015-07-11 10:10:57 +01:00
parent 8a24ad83c9
commit 02b44fcc60
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/cally/cally-actor.c
View File

@ -441,13 +441,13 @@ cally_actor_ref_state_set (AtkObject *obj)
} }
else else
{ {
if (CLUTTER_ACTOR_IS_REACTIVE (actor)) if (clutter_actor_get_reactive (actor))
{ {
atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE); atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
atk_state_set_add_state (state_set, ATK_STATE_ENABLED); atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
} }
if (CLUTTER_ACTOR_IS_VISIBLE (actor)) if (clutter_actor_is_visible (actor))
{ {
atk_state_set_add_state (state_set, ATK_STATE_VISIBLE); atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
@ -1013,17 +1013,17 @@ cally_actor_real_notify_clutter (GObject *obj,
if (g_strcmp0 (pspec->name, "visible") == 0) if (g_strcmp0 (pspec->name, "visible") == 0)
{ {
state = ATK_STATE_VISIBLE; state = ATK_STATE_VISIBLE;
value = CLUTTER_ACTOR_IS_VISIBLE (actor); value = clutter_actor_is_visible (actor);
} }
else if (g_strcmp0 (pspec->name, "mapped") == 0) else if (g_strcmp0 (pspec->name, "mapped") == 0)
{ {
state = ATK_STATE_SHOWING; state = ATK_STATE_SHOWING;
value = CLUTTER_ACTOR_IS_MAPPED (actor); value = clutter_actor_is_mapped (actor);
} }
else if (g_strcmp0 (pspec->name, "reactive") == 0) else if (g_strcmp0 (pspec->name, "reactive") == 0)
{ {
state = ATK_STATE_SENSITIVE; state = ATK_STATE_SENSITIVE;
value = CLUTTER_ACTOR_IS_REACTIVE (actor); value = clutter_actor_get_reactive (actor);
} }
else else
return; return;

2
clutter/cally/cally-text.c
View File

@ -2270,7 +2270,7 @@ _cally_misc_layout_get_default_attributes (AtkAttributeSet *attrib_set,
value); value);
value = g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_INVISIBLE, value = g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_INVISIBLE,
!CLUTTER_ACTOR_IS_VISIBLE (clutter_text))); !clutter_actor_is_visible (CLUTTER_ACTOR (clutter_text))));
attrib_set = _cally_misc_add_attribute (attrib_set, attrib_set = _cally_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_INVISIBLE, value); ATK_TEXT_ATTR_INVISIBLE, value);