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

cally: Remove unused variables

Browse Source
This commit is contained in:
Emmanuele Bassi 2011-02-19 16:45:35 +00:00
parent dfdcc20670
commit fd3462170f
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,13 +583,11 @@ static gint
cally_actor_get_n_children (AtkObject *obj) cally_actor_get_n_children (AtkObject *obj)
{ {
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
CallyActorPrivate *priv = NULL;
GList *children = NULL; GList *children = NULL;
gint num = 0; gint num = 0;
g_return_val_if_fail (CALLY_IS_ACTOR (obj), 0); g_return_val_if_fail (CALLY_IS_ACTOR (obj), 0);
priv = CALLY_ACTOR (obj)->priv;
actor = CALLY_GET_CLUTTER_ACTOR (obj); actor = CALLY_GET_CLUTTER_ACTOR (obj);
if (actor == NULL) /* State is defunct */ if (actor == NULL) /* State is defunct */
@ -618,13 +616,11 @@ cally_actor_ref_child (AtkObject *obj,
{ {
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
ClutterActor *child = NULL; ClutterActor *child = NULL;
CallyActorPrivate *priv = NULL;
GList *children = NULL; GList *children = NULL;
AtkObject *result = NULL; AtkObject *result = NULL;
g_return_val_if_fail (CALLY_IS_ACTOR (obj), NULL); g_return_val_if_fail (CALLY_IS_ACTOR (obj), NULL);
priv = CALLY_ACTOR (obj)->priv;
actor = CALLY_GET_CLUTTER_ACTOR (obj); actor = CALLY_GET_CLUTTER_ACTOR (obj);
if (actor == NULL) /* State is defunct */ if (actor == NULL) /* State is defunct */
@ -982,15 +978,13 @@ static gboolean
cally_actor_action_do_action (AtkAction *action, cally_actor_action_do_action (AtkAction *action,
gint index) gint index)
{ {
ClutterActor *actor = NULL;
CallyActor *cally_actor = NULL; CallyActor *cally_actor = NULL;
AtkStateSet *set = NULL; AtkStateSet *set = NULL;
CallyActorPrivate *priv = NULL; CallyActorPrivate *priv = NULL;
CallyActorActionInfo *info = NULL; CallyActorActionInfo *info = NULL;
cally_actor = CALLY_ACTOR (action); cally_actor = CALLY_ACTOR (action);
priv = cally_actor->priv; priv = cally_actor->priv;
actor = CALLY_GET_CLUTTER_ACTOR (cally_actor);
set = atk_object_ref_state_set (ATK_OBJECT (cally_actor)); set = atk_object_ref_state_set (ATK_OBJECT (cally_actor));

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

@ -420,7 +420,6 @@ cally_text_get_character_at_offset (AtkText *text,
gint offset) gint offset)
{ {
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
CallyText *cally_text = NULL;
gchar *string = NULL; gchar *string = NULL;
gchar *index = NULL; gchar *index = NULL;
gunichar unichar; gunichar unichar;
@ -429,7 +428,6 @@ cally_text_get_character_at_offset (AtkText *text,
if (actor == NULL) /* State is defunct */ if (actor == NULL) /* State is defunct */
return '\0'; return '\0';
cally_text = CALLY_TEXT (text);
string = clutter_text_get_chars (CLUTTER_TEXT (actor), 0, -1); string = clutter_text_get_chars (CLUTTER_TEXT (actor), 0, -1);
if (offset >= g_utf8_strlen (string, -1)) if (offset >= g_utf8_strlen (string, -1))
{ {
@ -455,20 +453,27 @@ cally_text_get_text_before_offset (AtkText *text,
gint *end_offset) gint *end_offset)
{ {
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
#if 0
ClutterText *clutter_text = NULL; ClutterText *clutter_text = NULL;
CallyText *cally_text = NULL; CallyText *cally_text = NULL;
#endif
actor = CALLY_GET_CLUTTER_ACTOR (text); actor = CALLY_GET_CLUTTER_ACTOR (text);
if (actor == NULL) /* State is defunct */ if (actor == NULL) /* State is defunct */
return NULL; return NULL;
#if 0
clutter_text = CLUTTER_TEXT (actor); clutter_text = CLUTTER_TEXT (actor);
cally_text = CALLY_TEXT (text); cally_text = CALLY_TEXT (text);
/* return gail_text_util_get_text (cally_text->priv->textutil, */ return gail_text_util_get_text (cally_text->priv->textutil,
/* clutter_text_get_layout (clutter_text), */ clutter_text_get_layout (clutter_text),
/* GAIL_BEFORE_OFFSET, boundary_type, */ GAIL_BEFORE_OFFSET,
/* offset, start_offset, end_offset); */ boundary_type,
offset,
start_offset, end_offset);
#endif
return NULL; return NULL;
} }
@ -480,19 +485,27 @@ cally_text_get_text_at_offset (AtkText *text,
gint *end_offset) gint *end_offset)
{ {
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
#if 0
ClutterText *clutter_text = NULL; ClutterText *clutter_text = NULL;
CallyText *cally_text = NULL; CallyText *cally_text = NULL;
#endif
actor = CALLY_GET_CLUTTER_ACTOR (text); actor = CALLY_GET_CLUTTER_ACTOR (text);
if (actor == NULL) /* State is defunct */ if (actor == NULL) /* State is defunct */
return NULL; return NULL;
#if 0
clutter_text = CLUTTER_TEXT (actor); clutter_text = CLUTTER_TEXT (actor);
cally_text = CALLY_TEXT (text); cally_text = CALLY_TEXT (text);
/* return gail_text_util_get_text (cally_text->priv->textutil, */ return gail_text_util_get_text (cally_text->priv->textutil,
/* clutter_text_get_layout (clutter_text), GAIL_AT_OFFSET, */ clutter_text_get_layout (clutter_text),
/* boundary_type, offset, start_offset, end_offset); */ GAIL_AT_OFFSET,
boundary_type,
offset,
start_offset, end_offset);
#endif
return NULL; return NULL;
} }
@ -504,19 +517,27 @@ cally_text_get_text_after_offset (AtkText *text,
gint *end_offset) gint *end_offset)
{ {
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
#if 0
ClutterText *clutter_text = NULL; ClutterText *clutter_text = NULL;
CallyText *cally_text = NULL; CallyText *cally_text = NULL;
#endif
actor = CALLY_GET_CLUTTER_ACTOR (text); actor = CALLY_GET_CLUTTER_ACTOR (text);
if (actor == NULL) /* State is defunct */ if (actor == NULL) /* State is defunct */
return NULL; return NULL;
#if 0
clutter_text = CLUTTER_TEXT (actor); clutter_text = CLUTTER_TEXT (actor);
cally_text = CALLY_TEXT (text); cally_text = CALLY_TEXT (text);
/* return gail_text_util_get_text (cally_text->priv->textutil, */ return gail_text_util_get_text (cally_text->priv->textutil,
/* clutter_text_get_layout (clutter_text), GAIL_AFTER_OFFSET, */ clutter_text_get_layout (clutter_text),
/* boundary_type, offset, start_offset, end_offset); */ GAIL_AFTER_OFFSET,
boundary_type,
offset,
start_offset, end_offset);
#endif
return NULL; return NULL;
} }

3
clutter/cally/cally-util.c
View File

@ -545,9 +545,8 @@ cally_util_stage_removed_cb (ClutterStageManager *stage_manager,
gpointer data) gpointer data)
{ {
GCallback cally_key_snooper_cb = G_CALLBACK (data); GCallback cally_key_snooper_cb = G_CALLBACK (data);
gint num = 0;
num = g_signal_handlers_disconnect_by_func (stage, cally_key_snooper_cb, NULL); g_signal_handlers_disconnect_by_func (stage, cally_key_snooper_cb, NULL);
} }
static void static void