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

script: Hide private symbols

Browse Source 
A bunch of private functions we use when parsing got exposed accidentaly
to the list of public symbols by virtue of not having the leading '_'
that we use to filter them out of the shared object — all the while the
header that declares them is a private, non installed one.

Let's rectify this situation with a bit of minor surgery on the code.
This commit is contained in:
Emmanuele Bassi 2011-09-07 16:14:10 +01:00
parent 9f70ea8dee
commit bcd37e2e3d
8 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-alpha.c
View File

@ -303,7 +303,7 @@ clutter_alpha_parse_custom_node (ClutterScriptable *scriptable,
{ {
gulong mode; gulong mode;
mode = clutter_script_resolve_animation_mode (node); mode = _clutter_script_resolve_animation_mode (node);
g_value_init (value, G_TYPE_ULONG); g_value_init (value, G_TYPE_ULONG);
g_value_set_ulong (value, mode); g_value_set_ulong (value, mode);

2
clutter/clutter-animation.c
View File

@ -431,7 +431,7 @@ clutter_animation_parse_custom_node (ClutterScriptable *scriptable,
{ {
gulong mode; gulong mode;
mode = clutter_script_resolve_animation_mode (node); mode = _clutter_script_resolve_animation_mode (node);
g_value_init (value, G_TYPE_ULONG); g_value_init (value, G_TYPE_ULONG);
g_value_set_ulong (value, mode); g_value_set_ulong (value, mode);

18
clutter/clutter-animator.c
View File

@ -1513,9 +1513,9 @@ resolve_interpolation (JsonNode *node)
gboolean res; gboolean res;
gint enum_value; gint enum_value;
res = clutter_script_enum_from_string (CLUTTER_TYPE_INTERPOLATION, res = _clutter_script_enum_from_string (CLUTTER_TYPE_INTERPOLATION,
str, str,
&enum_value); &enum_value);
if (res) if (res)
return enum_value; return enum_value;
} }
@ -1620,7 +1620,7 @@ parse_animator_property (JsonArray *array,
gboolean res; gboolean res;
progress = json_array_get_double_element (key, 0); progress = json_array_get_double_element (key, 0);
mode = clutter_script_resolve_animation_mode (json_array_get_element (key, 1)); mode = _clutter_script_resolve_animation_mode (json_array_get_element (key, 1));
animator_key = clutter_animator_key_new (clos->animator, animator_key = clutter_animator_key_new (clos->animator,
gobject, gobject,
@ -1628,11 +1628,11 @@ parse_animator_property (JsonArray *array,
progress, progress,
mode); mode);
res = clutter_script_parse_node (clos->script, res = _clutter_script_parse_node (clos->script,
&(animator_key->value), &(animator_key->value),
pname, pname,
json_array_get_element (key, 2), json_array_get_element (key, 2),
pspec); pspec);
if (!res) if (!res)
{ {
g_warning ("Unable to parse the key value for the " g_warning ("Unable to parse the key value for the "

12
clutter/clutter-model.c
View File

@ -680,9 +680,9 @@ clutter_model_set_custom_property (ClutterScriptable *scriptable,
column_name = clutter_model_get_column_name (model, i); column_name = clutter_model_get_column_name (model, i);
columns[i] = i; columns[i] = i;
g_value_init (&v, column_type); g_value_init (&v, column_type);
clutter_script_parse_node (script, &v, column_name, _clutter_script_parse_node (script, &v, column_name,
json_array_get_element (array, i), json_array_get_element (array, i),
NULL); NULL);
g_value_array_append (values, &v); g_value_array_append (values, &v);
g_value_unset (&v); g_value_unset (&v);
} }
@ -719,9 +719,9 @@ clutter_model_set_custom_property (ClutterScriptable *scriptable,
columns[column] = i; columns[column] = i;
g_value_init (&v, col_type); g_value_init (&v, col_type);
member = json_object_get_member (object, mname); member = json_object_get_member (object, mname);
clutter_script_parse_node (script, &v, _clutter_script_parse_node (script, &v,
col_name, member, col_name, member,
NULL); NULL);
g_value_array_append (values, &v); g_value_array_append (values, &v);
g_value_unset (&v); g_value_unset (&v);
break; break;

114
clutter/clutter-script-parser.c
View File

@ -66,7 +66,7 @@ clutter_script_parser_init (ClutterScriptParser *parser)
} }
GType GType
clutter_script_get_type_from_symbol (const gchar *symbol) _clutter_script_get_type_from_symbol (const gchar *symbol)
{ {
static GModule *module = NULL; static GModule *module = NULL;
GTypeGetFunc func; GTypeGetFunc func;
@ -82,7 +82,7 @@ clutter_script_get_type_from_symbol (const gchar *symbol)
} }
GType GType
clutter_script_get_type_from_class (const gchar *name) _clutter_script_get_type_from_class (const gchar *name)
{ {
static GModule *module = NULL; static GModule *module = NULL;
GString *symbol_name = g_string_sized_new (64); GString *symbol_name = g_string_sized_new (64);
@ -160,9 +160,9 @@ clutter_script_get_type_from_class (const gchar *name)
* Return value: %TRUE if the conversion was successfull. * Return value: %TRUE if the conversion was successfull.
*/ */
gboolean gboolean
clutter_script_enum_from_string (GType type, _clutter_script_enum_from_string (GType type,
const gchar *string, const gchar *string,
gint *enum_value) gint *enum_value)
{ {
GEnumClass *eclass; GEnumClass *eclass;
GEnumValue *ev; GEnumValue *ev;
@ -195,9 +195,9 @@ clutter_script_enum_from_string (GType type,
} }
gboolean gboolean
clutter_script_flags_from_string (GType type, _clutter_script_flags_from_string (GType type,
const gchar *string, const gchar *string,
gint *flags_value) gint *flags_value)
{ {
gchar *endptr, *prevptr; gchar *endptr, *prevptr;
guint i, j, ret, value; guint i, j, ret, value;
@ -323,9 +323,9 @@ parse_knot_from_object (JsonObject *object,
} }
gboolean gboolean
clutter_script_parse_knot (ClutterScript *script, _clutter_script_parse_knot (ClutterScript *script,
JsonNode *node, JsonNode *node,
ClutterKnot *knot) ClutterKnot *knot)
{ {
g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE); g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE);
g_return_val_if_fail (node != NULL, FALSE); g_return_val_if_fail (node != NULL, FALSE);
@ -389,9 +389,9 @@ parse_geometry_from_object (JsonObject *object,
} }
gboolean gboolean
clutter_script_parse_geometry (ClutterScript *script, _clutter_script_parse_geometry (ClutterScript *script,
JsonNode *node, JsonNode *node,
ClutterGeometry *geometry) ClutterGeometry *geometry)
{ {
g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE); g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE);
g_return_val_if_fail (node != NULL, FALSE); g_return_val_if_fail (node != NULL, FALSE);
@ -460,9 +460,9 @@ parse_color_from_object (JsonObject *object,
} }
gboolean gboolean
clutter_script_parse_color (ClutterScript *script, _clutter_script_parse_color (ClutterScript *script,
JsonNode *node, JsonNode *node,
ClutterColor *color) ClutterColor *color)
{ {
g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE); g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE);
g_return_val_if_fail (node != NULL, FALSE); g_return_val_if_fail (node != NULL, FALSE);
@ -774,7 +774,7 @@ static const struct
static const gint n_animation_modes = G_N_ELEMENTS (animation_modes); static const gint n_animation_modes = G_N_ELEMENTS (animation_modes);
gulong gulong
clutter_script_resolve_animation_mode (JsonNode *node) _clutter_script_resolve_animation_mode (JsonNode *node)
{ {
gint i, res = CLUTTER_CUSTOM_MODE; gint i, res = CLUTTER_CUSTOM_MODE;
@ -800,9 +800,9 @@ clutter_script_resolve_animation_mode (JsonNode *node)
return animation_modes[i].mode; return animation_modes[i].mode;
} }
if (clutter_script_enum_from_string (CLUTTER_TYPE_ANIMATION_MODE, if (_clutter_script_enum_from_string (CLUTTER_TYPE_ANIMATION_MODE,
name, name,
&res)) &res))
return res; return res;
g_warning ("Unable to find the animation mode '%s'", name); g_warning ("Unable to find the animation mode '%s'", name);
@ -869,7 +869,7 @@ _clutter_script_parse_alpha (ClutterScript *script,
val = json_object_get_member (object, "mode"); val = json_object_get_member (object, "mode");
if (val != NULL) if (val != NULL)
mode = clutter_script_resolve_animation_mode (val); mode = _clutter_script_resolve_animation_mode (val);
if (mode == CLUTTER_CUSTOM_MODE) if (mode == CLUTTER_CUSTOM_MODE)
{ {
@ -1083,11 +1083,11 @@ clutter_script_parser_parse_end (JsonParser *parser)
} }
gboolean gboolean
clutter_script_parse_node (ClutterScript *script, _clutter_script_parse_node (ClutterScript *script,
GValue *value, GValue *value,
const gchar *name, const gchar *name,
JsonNode *node, JsonNode *node,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GValue node_value = { 0, }; GValue node_value = { 0, };
gboolean retval = FALSE; gboolean retval = FALSE;
@ -1155,7 +1155,7 @@ clutter_script_parse_node (ClutterScript *script,
/* knot := { "x" : (int), "y" : (int) } */ /* knot := { "x" : (int), "y" : (int) } */
if (clutter_script_parse_knot (script, node, &knot)) if (_clutter_script_parse_knot (script, node, &knot))
{ {
g_value_set_boxed (value, &knot); g_value_set_boxed (value, &knot);
return TRUE; return TRUE;
@ -1173,7 +1173,7 @@ clutter_script_parse_node (ClutterScript *script,
* } * }
*/ */
if (clutter_script_parse_geometry (script, node, &geom)) if (_clutter_script_parse_geometry (script, node, &geom))
{ {
g_value_set_boxed (value, &geom); g_value_set_boxed (value, &geom);
return TRUE; return TRUE;
@ -1191,7 +1191,7 @@ clutter_script_parse_node (ClutterScript *script,
* } * }
*/ */
if (clutter_script_parse_color (script, node, &color)) if (_clutter_script_parse_color (script, node, &color))
{ {
g_value_set_boxed (value, &color); g_value_set_boxed (value, &color);
return TRUE; return TRUE;
@ -1214,7 +1214,7 @@ clutter_script_parse_node (ClutterScript *script,
/* knot := [ (int), (int) ] */ /* knot := [ (int), (int) ] */
if (clutter_script_parse_knot (script, node, &knot)) if (_clutter_script_parse_knot (script, node, &knot))
{ {
g_value_set_boxed (value, &knot); g_value_set_boxed (value, &knot);
return TRUE; return TRUE;
@ -1226,7 +1226,7 @@ clutter_script_parse_node (ClutterScript *script,
/* geometry := [ (int), (int), (int), (int) ] */ /* geometry := [ (int), (int), (int), (int) ] */
if (clutter_script_parse_geometry (script, node, &geom)) if (_clutter_script_parse_geometry (script, node, &geom))
{ {
g_value_set_boxed (value, &geom); g_value_set_boxed (value, &geom);
return TRUE; return TRUE;
@ -1238,7 +1238,7 @@ clutter_script_parse_node (ClutterScript *script,
/* color := [ (int), (int), (int), (int) ] */ /* color := [ (int), (int), (int), (int) ] */
if (clutter_script_parse_color (script, node, &color)) if (_clutter_script_parse_color (script, node, &color))
{ {
g_value_set_boxed (value, &color); g_value_set_boxed (value, &color);
return TRUE; return TRUE;
@ -1337,9 +1337,9 @@ clutter_script_parse_node (ClutterScript *script,
{ {
gint enum_value; gint enum_value;
retval = clutter_script_enum_from_string (G_VALUE_TYPE (value), retval = _clutter_script_enum_from_string (G_VALUE_TYPE (value),
g_value_get_string (&node_value), g_value_get_string (&node_value),
&enum_value); &enum_value);
if (retval) if (retval)
g_value_set_enum (value, enum_value); g_value_set_enum (value, enum_value);
} }
@ -1355,9 +1355,9 @@ clutter_script_parse_node (ClutterScript *script,
{ {
gint flags_value; gint flags_value;
retval = clutter_script_flags_from_string (G_VALUE_TYPE (value), retval = _clutter_script_flags_from_string (G_VALUE_TYPE (value),
g_value_get_string (&node_value), g_value_get_string (&node_value),
&flags_value); &flags_value);
if (retval) if (retval)
g_value_set_flags (value, flags_value); g_value_set_flags (value, flags_value);
} }
@ -1368,7 +1368,7 @@ clutter_script_parse_node (ClutterScript *script,
{ {
ClutterColor color = { 0, }; ClutterColor color = { 0, };
retval = clutter_script_parse_color (script, node, &color); retval = _clutter_script_parse_color (script, node, &color);
if (retval) if (retval)
clutter_value_set_color (value, &color); clutter_value_set_color (value, &color);
} }
@ -1464,10 +1464,10 @@ clutter_script_translate_parameters (ClutterScript *script,
pinfo->node); pinfo->node);
if (!res) if (!res)
res = clutter_script_parse_node (script, &param.value, res = _clutter_script_parse_node (script, &param.value,
pinfo->name, pinfo->name,
pinfo->node, pinfo->node,
pinfo->pspec); pinfo->pspec);
if (!res) if (!res)
{ {
@ -1534,10 +1534,10 @@ clutter_script_construct_parameters (ClutterScript *script,
param.name = g_strdup (pinfo->name); param.name = g_strdup (pinfo->name);
if (!clutter_script_parse_node (script, &param.value, if (!_clutter_script_parse_node (script, &param.value,
pinfo->name, pinfo->name,
pinfo->node, pinfo->node,
pinfo->pspec)) pinfo->pspec))
{ {
unparsed = g_list_prepend (unparsed, pinfo); unparsed = g_list_prepend (unparsed, pinfo);
continue; continue;
@ -1626,10 +1626,10 @@ apply_layout_properties (ClutterScript *script,
pinfo->node); pinfo->node);
if (!res) if (!res)
res = clutter_script_parse_node (script, &value, res = _clutter_script_parse_node (script, &value,
name, name,
pinfo->node, pinfo->node,
pinfo->pspec); pinfo->pspec);
if (!res) if (!res)
{ {
@ -1726,10 +1726,10 @@ apply_child_properties (ClutterScript *script,
pinfo->node); pinfo->node);
if (!res) if (!res)
res = clutter_script_parse_node (script, &value, res = _clutter_script_parse_node (script, &value,
name, name,
pinfo->node, pinfo->node,
pinfo->pspec); pinfo->pspec);
if (!res) if (!res)
{ {
@ -1952,7 +1952,7 @@ _clutter_script_construct_object (ClutterScript *script,
if (oinfo->gtype == G_TYPE_INVALID) if (oinfo->gtype == G_TYPE_INVALID)
{ {
if (G_UNLIKELY (oinfo->type_func)) if (G_UNLIKELY (oinfo->type_func))
oinfo->gtype = clutter_script_get_type_from_symbol (oinfo->type_func); oinfo->gtype = _clutter_script_get_type_from_symbol (oinfo->type_func);
else else
oinfo->gtype = clutter_script_get_type_from_name (script, oinfo->class_name); oinfo->gtype = clutter_script_get_type_from_name (script, oinfo->class_name);

46
clutter/clutter-script-private.h
View File

@ -101,33 +101,33 @@ void property_info_free (gpointer data);
GType clutter_script_parser_get_type (void) G_GNUC_CONST; GType clutter_script_parser_get_type (void) G_GNUC_CONST;
gboolean clutter_script_parse_node (ClutterScript *script, gboolean _clutter_script_parse_node (ClutterScript *script,
GValue *value, GValue *value,
const gchar *name, const gchar *name,
JsonNode *node, JsonNode *node,
GParamSpec *pspec); GParamSpec *pspec);
GType clutter_script_get_type_from_symbol (const gchar *symbol); GType _clutter_script_get_type_from_symbol (const gchar *symbol);
GType clutter_script_get_type_from_class (const gchar *name); GType _clutter_script_get_type_from_class (const gchar *name);
gulong clutter_script_resolve_animation_mode (JsonNode *node); gulong _clutter_script_resolve_animation_mode (JsonNode *node);
gboolean clutter_script_enum_from_string (GType gtype, gboolean _clutter_script_enum_from_string (GType gtype,
const gchar *string, const gchar *string,
gint *enum_value); gint *enum_value);
gboolean clutter_script_flags_from_string (GType gtype, gboolean _clutter_script_flags_from_string (GType gtype,
const gchar *string, const gchar *string,
gint *flags_value); gint *flags_value);
gboolean clutter_script_parse_knot (ClutterScript *script, gboolean _clutter_script_parse_knot (ClutterScript *script,
JsonNode *node, JsonNode *node,
ClutterKnot *knot); ClutterKnot *knot);
gboolean clutter_script_parse_geometry (ClutterScript *script, gboolean _clutter_script_parse_geometry (ClutterScript *script,
JsonNode *node, JsonNode *node,
ClutterGeometry *geometry); ClutterGeometry *geometry);
gboolean clutter_script_parse_color (ClutterScript *script, gboolean _clutter_script_parse_color (ClutterScript *script,
JsonNode *node, JsonNode *node,
ClutterColor *color); ClutterColor *color);
GObject *_clutter_script_parse_alpha (ClutterScript *script, GObject *_clutter_script_parse_alpha (ClutterScript *script,
JsonNode *node); JsonNode *node);

2
clutter/clutter-script.c
View File

@ -294,7 +294,7 @@ clutter_script_real_get_type_from_name (ClutterScript *script,
if (gtype != G_TYPE_INVALID) if (gtype != G_TYPE_INVALID)
return gtype; return gtype;
return clutter_script_get_type_from_class (type_name); return _clutter_script_get_type_from_class (type_name);
} }
void void

12
clutter/clutter-state.c
View File

@ -2136,17 +2136,17 @@ parse_state_transition (JsonArray *array,
continue; continue;
} }
mode = clutter_script_resolve_animation_mode (json_array_get_element (key, 2)); mode = _clutter_script_resolve_animation_mode (json_array_get_element (key, 2));
state_key = clutter_state_key_new (target_state, state_key = clutter_state_key_new (target_state,
gobject, property, pspec, gobject, property, pspec,
mode); mode);
res = clutter_script_parse_node (clos->script, res = _clutter_script_parse_node (clos->script,
&(state_key->value), &(state_key->value),
property, property,
json_array_get_element (key, 3), json_array_get_element (key, 3),
pspec); pspec);
if (!res) if (!res)
{ {
g_warning ("Unable to parse the key value for the " g_warning ("Unable to parse the key value for the "