[clutter] cally: Drop use of deprecated macros
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] cally: Drop use of deprecated macros
- Date: Sat, 11 Jul 2015 09:21:41 +0000 (UTC)
commit 02b44fcc60f5bf1aa335c9d6df003695f84fdb2d
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Jul 11 10:10:57 2015 +0100
cally: Drop use of deprecated macros
Use the equivalent functions instead.
clutter/cally/cally-actor.c | 10 +++++-----
clutter/cally/cally-text.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/clutter/cally/cally-actor.c b/clutter/cally/cally-actor.c
index 6c861ad..8163e79 100644
--- a/clutter/cally/cally-actor.c
+++ b/clutter/cally/cally-actor.c
@@ -441,13 +441,13 @@ cally_actor_ref_state_set (AtkObject *obj)
}
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_ENABLED);
}
- if (CLUTTER_ACTOR_IS_VISIBLE (actor))
+ if (clutter_actor_is_visible (actor))
{
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)
{
state = ATK_STATE_VISIBLE;
- value = CLUTTER_ACTOR_IS_VISIBLE (actor);
+ value = clutter_actor_is_visible (actor);
}
else if (g_strcmp0 (pspec->name, "mapped") == 0)
{
state = ATK_STATE_SHOWING;
- value = CLUTTER_ACTOR_IS_MAPPED (actor);
+ value = clutter_actor_is_mapped (actor);
}
else if (g_strcmp0 (pspec->name, "reactive") == 0)
{
state = ATK_STATE_SENSITIVE;
- value = CLUTTER_ACTOR_IS_REACTIVE (actor);
+ value = clutter_actor_get_reactive (actor);
}
else
return;
diff --git a/clutter/cally/cally-text.c b/clutter/cally/cally-text.c
index 0b6606f..734aa6a 100644
--- a/clutter/cally/cally-text.c
+++ b/clutter/cally/cally-text.c
@@ -2270,7 +2270,7 @@ _cally_misc_layout_get_default_attributes (AtkAttributeSet *attrib_set,
value);
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,
ATK_TEXT_ATTR_INVISIBLE, value);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]