From fd3462170f3d36a8ddc128611074116d5cc62ba6 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 19 Feb 2011 16:45:35 +0000 Subject: [PATCH] cally: Remove unused variables --- clutter/cally/cally-actor.c | 12 +++------- clutter/cally/cally-text.c | 45 +++++++++++++++++++++++++++---------- clutter/cally/cally-util.c | 3 +-- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/clutter/cally/cally-actor.c b/clutter/cally/cally-actor.c index 12eed7e72..920d964be 100644 --- a/clutter/cally/cally-actor.c +++ b/clutter/cally/cally-actor.c @@ -583,13 +583,11 @@ static gint cally_actor_get_n_children (AtkObject *obj) { ClutterActor *actor = NULL; - CallyActorPrivate *priv = NULL; GList *children = NULL; gint num = 0; g_return_val_if_fail (CALLY_IS_ACTOR (obj), 0); - priv = CALLY_ACTOR (obj)->priv; actor = CALLY_GET_CLUTTER_ACTOR (obj); if (actor == NULL) /* State is defunct */ @@ -618,13 +616,11 @@ cally_actor_ref_child (AtkObject *obj, { ClutterActor *actor = NULL; ClutterActor *child = NULL; - CallyActorPrivate *priv = NULL; GList *children = NULL; AtkObject *result = NULL; g_return_val_if_fail (CALLY_IS_ACTOR (obj), NULL); - priv = CALLY_ACTOR (obj)->priv; actor = CALLY_GET_CLUTTER_ACTOR (obj); if (actor == NULL) /* State is defunct */ @@ -982,15 +978,13 @@ static gboolean cally_actor_action_do_action (AtkAction *action, gint index) { - ClutterActor *actor = NULL; CallyActor *cally_actor = NULL; - AtkStateSet *set = NULL; - CallyActorPrivate *priv = NULL; - CallyActorActionInfo *info = NULL; + AtkStateSet *set = NULL; + CallyActorPrivate *priv = NULL; + CallyActorActionInfo *info = NULL; cally_actor = CALLY_ACTOR (action); priv = cally_actor->priv; - actor = CALLY_GET_CLUTTER_ACTOR (cally_actor); set = atk_object_ref_state_set (ATK_OBJECT (cally_actor)); diff --git a/clutter/cally/cally-text.c b/clutter/cally/cally-text.c index f7c72d9f6..55b4ce7a4 100644 --- a/clutter/cally/cally-text.c +++ b/clutter/cally/cally-text.c @@ -420,7 +420,6 @@ cally_text_get_character_at_offset (AtkText *text, gint offset) { ClutterActor *actor = NULL; - CallyText *cally_text = NULL; gchar *string = NULL; gchar *index = NULL; gunichar unichar; @@ -429,7 +428,6 @@ cally_text_get_character_at_offset (AtkText *text, if (actor == NULL) /* State is defunct */ return '\0'; - cally_text = CALLY_TEXT (text); string = clutter_text_get_chars (CLUTTER_TEXT (actor), 0, -1); if (offset >= g_utf8_strlen (string, -1)) { @@ -455,20 +453,27 @@ cally_text_get_text_before_offset (AtkText *text, gint *end_offset) { ClutterActor *actor = NULL; +#if 0 ClutterText *clutter_text = NULL; CallyText *cally_text = NULL; +#endif actor = CALLY_GET_CLUTTER_ACTOR (text); if (actor == NULL) /* State is defunct */ return NULL; +#if 0 clutter_text = CLUTTER_TEXT (actor); cally_text = CALLY_TEXT (text); -/* return gail_text_util_get_text (cally_text->priv->textutil, */ -/* clutter_text_get_layout (clutter_text), */ -/* GAIL_BEFORE_OFFSET, boundary_type, */ -/* offset, start_offset, end_offset); */ + return gail_text_util_get_text (cally_text->priv->textutil, + clutter_text_get_layout (clutter_text), + GAIL_BEFORE_OFFSET, + boundary_type, + offset, + start_offset, end_offset); +#endif + return NULL; } @@ -480,19 +485,27 @@ cally_text_get_text_at_offset (AtkText *text, gint *end_offset) { ClutterActor *actor = NULL; +#if 0 ClutterText *clutter_text = NULL; CallyText *cally_text = NULL; +#endif actor = CALLY_GET_CLUTTER_ACTOR (text); if (actor == NULL) /* State is defunct */ return NULL; +#if 0 clutter_text = CLUTTER_TEXT (actor); cally_text = CALLY_TEXT (text); -/* return gail_text_util_get_text (cally_text->priv->textutil, */ -/* clutter_text_get_layout (clutter_text), GAIL_AT_OFFSET, */ -/* boundary_type, offset, start_offset, end_offset); */ + return gail_text_util_get_text (cally_text->priv->textutil, + clutter_text_get_layout (clutter_text), + GAIL_AT_OFFSET, + boundary_type, + offset, + start_offset, end_offset); +#endif + return NULL; } @@ -504,19 +517,27 @@ cally_text_get_text_after_offset (AtkText *text, gint *end_offset) { ClutterActor *actor = NULL; +#if 0 ClutterText *clutter_text = NULL; CallyText *cally_text = NULL; +#endif actor = CALLY_GET_CLUTTER_ACTOR (text); if (actor == NULL) /* State is defunct */ return NULL; +#if 0 clutter_text = CLUTTER_TEXT (actor); cally_text = CALLY_TEXT (text); -/* return gail_text_util_get_text (cally_text->priv->textutil, */ -/* clutter_text_get_layout (clutter_text), GAIL_AFTER_OFFSET, */ -/* boundary_type, offset, start_offset, end_offset); */ + return gail_text_util_get_text (cally_text->priv->textutil, + clutter_text_get_layout (clutter_text), + GAIL_AFTER_OFFSET, + boundary_type, + offset, + start_offset, end_offset); +#endif + return NULL; } diff --git a/clutter/cally/cally-util.c b/clutter/cally/cally-util.c index fd0b43a2a..25ba58af5 100644 --- a/clutter/cally/cally-util.c +++ b/clutter/cally/cally-util.c @@ -545,9 +545,8 @@ cally_util_stage_removed_cb (ClutterStageManager *stage_manager, gpointer 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