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

Rename some methods and includes to avoid -Wshadow warnings

Browse Source 
http://bugzilla.clutter-project.org/show_bug.cgi?id=2097
This commit is contained in:
Alejandro Piñeiro 2010-06-15 13:45:19 +02:00 committed by Emmanuele Bassi
parent 72da871c0a
commit 774541d71e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,6 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
#ifdef HAVE_CLUTTER_X11 #ifdef HAVE_CLUTTER_X11
@ -1224,12 +1223,12 @@ cally_actor_real_notify_clutter (GObject *obj,
AtkState state; AtkState state;
gboolean value; gboolean value;
if (strcmp (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 (strcmp (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_IS_REACTIVE (actor);

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

@ -295,7 +295,7 @@ _listener_info_destroy (gpointer data)
static guint static guint
add_listener (GSignalEmissionHook listener, add_listener (GSignalEmissionHook listener,
const gchar *object_type, const gchar *object_type,
const gchar *signal, const gchar *signal_name,
const gchar *hook_data) const gchar *hook_data)
{ {
GType type; GType type;
@ -305,7 +305,7 @@ add_listener (GSignalEmissionHook listener,
type = g_type_from_name (object_type); type = g_type_from_name (object_type);
if (type) if (type)
{ {
signal_id = g_signal_lookup (signal, type); signal_id = g_signal_lookup (signal_name, type);
if (signal_id > 0) if (signal_id > 0)
{ {
CallyUtilListenerInfo *listener_info; CallyUtilListenerInfo *listener_info;
@ -327,7 +327,7 @@ add_listener (GSignalEmissionHook listener,
{ {
/* This is mainly because some "window:xxx" methods not /* This is mainly because some "window:xxx" methods not
implemented on CallyStage */ implemented on CallyStage */
g_debug ("Signal type %s not supported\n", signal); g_debug ("Signal type %s not supported\n", signal_name);
} }
} }
else else
@ -521,10 +521,10 @@ cally_util_stage_added_cb (ClutterStageManager *stage_manager,
ClutterStage *stage, ClutterStage *stage,
gpointer data) gpointer data)
{ {
GCallback cally_key_snooper = G_CALLBACK (data); GCallback cally_key_snooper_cb = G_CALLBACK (data);
AtkObject *cally_stage = NULL; AtkObject *cally_stage = NULL;
g_signal_connect (G_OBJECT (stage), "captured-event", cally_key_snooper, NULL); g_signal_connect (G_OBJECT (stage), "captured-event", cally_key_snooper_cb, NULL);
cally_stage = clutter_actor_get_accessible (CLUTTER_ACTOR (stage)); cally_stage = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
if (cally_stage != NULL) if (cally_stage != NULL)
@ -536,11 +536,11 @@ cally_util_stage_removed_cb (ClutterStageManager *stage_manager,
ClutterStage *stage, ClutterStage *stage,
gpointer data) gpointer data)
{ {
GCallback cally_key_snooper = G_CALLBACK (data); GCallback cally_key_snooper_cb = G_CALLBACK (data);
gint num = 0; gint num = 0;
AtkObject *cally_stage = NULL; AtkObject *cally_stage = NULL;
num = g_signal_handlers_disconnect_by_func (stage, cally_key_snooper, NULL); num = g_signal_handlers_disconnect_by_func (stage, cally_key_snooper_cb, NULL);
cally_stage = clutter_actor_get_accessible (CLUTTER_ACTOR (stage)); cally_stage = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
if (cally_stage != NULL) if (cally_stage != NULL)