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

Remove usage of the grave accent as quotation mark

Browse Source 
See:

  http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html

This should make Thomas happy.
This commit is contained in:
Emmanuele Bassi 2009-03-17 14:12:01 +00:00
parent 39e2b43b22
commit ccca24ab76
25 changed files with 118 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clutter/clutter-actor.c
View File

@ -2103,7 +2103,7 @@ clutter_actor_dispose (GObject *object)
ClutterActor *self = CLUTTER_ACTOR (object); ClutterActor *self = CLUTTER_ACTOR (object);
ClutterActorPrivate *priv = self->priv; ClutterActorPrivate *priv = self->priv;
CLUTTER_NOTE (MISC, "Disposing of object (id=%d) of type `%s' (ref_count:%d)", CLUTTER_NOTE (MISC, "Disposing of object (id=%d) of type '%s' (ref_count:%d)",
self->priv->id, self->priv->id,
g_type_name (G_OBJECT_TYPE (self)), g_type_name (G_OBJECT_TYPE (self)),
object->ref_count); object->ref_count);
@ -2139,7 +2139,7 @@ clutter_actor_finalize (GObject *object)
{ {
ClutterActor *actor = CLUTTER_ACTOR (object); ClutterActor *actor = CLUTTER_ACTOR (object);
CLUTTER_NOTE (MISC, "Finalize object (id=%d) of type `%s'", CLUTTER_NOTE (MISC, "Finalize object (id=%d) of type '%s'",
actor->priv->id, actor->priv->id,
g_type_name (G_OBJECT_TYPE (actor))); g_type_name (G_OBJECT_TYPE (actor)));
@ -7033,7 +7033,7 @@ parse_units (ClutterActor *self,
if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL) if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL)
{ {
g_warning ("Unable to set percentage of %s on a top-level " g_warning ("Unable to set percentage of %s on a top-level "
"actor of type `%s'", "actor of type '%s'",
(dimension == PARSE_X || (dimension == PARSE_X ||
dimension == PARSE_WIDTH || dimension == PARSE_WIDTH ||
dimension == PARSE_ANCHOR_X) ? "width" : "height", dimension == PARSE_ANCHOR_X) ? "width" : "height",
@ -7060,9 +7060,9 @@ parse_units (ClutterActor *self,
goto out; goto out;
} }
g_warning ("Invalid value `%s': integers, strings or floating point " g_warning ("Invalid value '%s': integers, strings or floating point "
"values can be used for the x, y, width and height " "values can be used for the x, y, width and height "
"properties. Valid modifiers for strings are `px', 'mm' " "properties. Valid modifiers for strings are 'px', 'mm' "
"and '%%'.", "and '%%'.",
g_value_get_string (&value)); g_value_get_string (&value));
@ -7080,7 +7080,7 @@ parse_units (ClutterActor *self,
if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL) if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL)
{ {
g_warning ("Unable to set percentage of %s on a top-level " g_warning ("Unable to set percentage of %s on a top-level "
"actor of type `%s'", "actor of type '%s'",
(dimension == PARSE_X || dimension == PARSE_WIDTH) ? "width" (dimension == PARSE_X || dimension == PARSE_WIDTH) ? "width"
: "height", : "height",
g_type_name (G_OBJECT_TYPE (self))); g_type_name (G_OBJECT_TYPE (self)));
@ -7103,7 +7103,7 @@ parse_units (ClutterActor *self,
} }
else else
{ {
g_warning ("Invalid value of type `%s': integers, strings of floating " g_warning ("Invalid value of type '%s': integers, strings of floating "
"point values can be used for the x, y, width, height " "point values can be used for the x, y, width, height "
"anchor-x and anchor-y properties.", "anchor-x and anchor-y properties.",
g_type_name (G_VALUE_TYPE (&value))); g_type_name (G_VALUE_TYPE (&value)));
@ -7190,7 +7190,7 @@ parse_rotation (ClutterActor *actor,
if (JSON_NODE_TYPE (node) != JSON_NODE_ARRAY) if (JSON_NODE_TYPE (node) != JSON_NODE_ARRAY)
{ {
g_warning ("Invalid node of type `%s' found, expecting an array", g_warning ("Invalid node of type '%s' found, expecting an array",
json_node_type_name (node)); json_node_type_name (node));
return FALSE; return FALSE;
} }
@ -7206,7 +7206,7 @@ parse_rotation (ClutterActor *actor,
if (JSON_NODE_TYPE (element) != JSON_NODE_OBJECT) if (JSON_NODE_TYPE (element) != JSON_NODE_OBJECT)
{ {
g_warning ("Invalid node of type `%s' found, expecting an object", g_warning ("Invalid node of type '%s' found, expecting an object",
json_node_type_name (element)); json_node_type_name (element));
return FALSE; return FALSE;
} }

44
clutter/clutter-animation.c
View File

@ -398,7 +398,7 @@ clutter_animation_bind_property_internal (ClutterAnimation *animation,
if (!clutter_interval_validate (interval, pspec)) if (!clutter_interval_validate (interval, pspec))
{ {
g_warning ("Cannot bind property `%s': the interval is out " g_warning ("Cannot bind property '%s': the interval is out "
"of bounds", "of bounds",
pspec->name); pspec->name);
return; return;
@ -418,7 +418,7 @@ clutter_animation_update_property_internal (ClutterAnimation *animation,
if (!clutter_interval_validate (interval, pspec)) if (!clutter_interval_validate (interval, pspec))
{ {
g_warning ("Cannot bind property `%s': the interval is out " g_warning ("Cannot bind property '%s': the interval is out "
"of bounds", "of bounds",
pspec->name); pspec->name);
return; return;
@ -442,7 +442,7 @@ clutter_animation_validate_bind (ClutterAnimation *animation,
if (G_UNLIKELY (!priv->object)) if (G_UNLIKELY (!priv->object))
{ {
g_warning ("Cannot bind property `%s': the animation has no " g_warning ("Cannot bind property '%s': the animation has no "
"object set. You need to call clutter_animation_set_object() " "object set. You need to call clutter_animation_set_object() "
"first to be able to bind a property", "first to be able to bind a property",
property_name); property_name);
@ -451,7 +451,7 @@ clutter_animation_validate_bind (ClutterAnimation *animation,
if (G_UNLIKELY (clutter_animation_has_property (animation, property_name))) if (G_UNLIKELY (clutter_animation_has_property (animation, property_name)))
{ {
g_warning ("Cannot bind property `%s': the animation already has " g_warning ("Cannot bind property '%s': the animation already has "
"a bound property with the same name", "a bound property with the same name",
property_name); property_name);
return NULL; return NULL;
@ -461,7 +461,7 @@ clutter_animation_validate_bind (ClutterAnimation *animation,
pspec = g_object_class_find_property (klass, property_name); pspec = g_object_class_find_property (klass, property_name);
if (!pspec) if (!pspec)
{ {
g_warning ("Cannot bind property `%s': objects of type `%s' have " g_warning ("Cannot bind property '%s': objects of type '%s' have "
"no such property", "no such property",
property_name, property_name,
g_type_name (G_OBJECT_TYPE (priv->object))); g_type_name (G_OBJECT_TYPE (priv->object)));
@ -470,7 +470,7 @@ clutter_animation_validate_bind (ClutterAnimation *animation,
if (!(pspec->flags & G_PARAM_WRITABLE)) if (!(pspec->flags & G_PARAM_WRITABLE))
{ {
g_warning ("Cannot bind property `%s': the property is not writable", g_warning ("Cannot bind property '%s': the property is not writable",
property_name); property_name);
return NULL; return NULL;
} }
@ -478,9 +478,9 @@ clutter_animation_validate_bind (ClutterAnimation *animation,
if (!g_value_type_compatible (G_PARAM_SPEC_VALUE_TYPE (pspec), if (!g_value_type_compatible (G_PARAM_SPEC_VALUE_TYPE (pspec),
argtype)) argtype))
{ {
g_warning ("Cannot bind property `%s': the interval value of " g_warning ("Cannot bind property '%s': the interval value of "
"type `%s' is not compatible with the property value " "type '%s' is not compatible with the property value "
"of type `%s'", "of type '%s'",
property_name, property_name,
g_type_name (argtype), g_type_name (argtype),
g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec))); g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)));
@ -600,7 +600,7 @@ clutter_animation_unbind_property (ClutterAnimation *animation,
if (!clutter_animation_has_property (animation, property_name)) if (!clutter_animation_has_property (animation, property_name))
{ {
g_warning ("Cannot unbind property `%s': the animation has " g_warning ("Cannot unbind property '%s': the animation has "
"no bound property with that name", "no bound property with that name",
property_name); property_name);
return; return;
@ -663,7 +663,7 @@ clutter_animation_update_interval (ClutterAnimation *animation,
if (!clutter_animation_has_property (animation, property_name)) if (!clutter_animation_has_property (animation, property_name))
{ {
g_warning ("Cannot unbind property `%s': the animation has " g_warning ("Cannot unbind property '%s': the animation has "
"no bound property with that name", "no bound property with that name",
property_name); property_name);
return; return;
@ -673,7 +673,7 @@ clutter_animation_update_interval (ClutterAnimation *animation,
pspec = g_object_class_find_property (klass, property_name); pspec = g_object_class_find_property (klass, property_name);
if (!pspec) if (!pspec)
{ {
g_warning ("Cannot bind property `%s': objects of type `%s' have " g_warning ("Cannot bind property '%s': objects of type '%s' have "
"no such property", "no such property",
property_name, property_name,
g_type_name (G_OBJECT_TYPE (priv->object))); g_type_name (G_OBJECT_TYPE (priv->object)));
@ -683,9 +683,9 @@ clutter_animation_update_interval (ClutterAnimation *animation,
if (!g_value_type_compatible (G_PARAM_SPEC_VALUE_TYPE (pspec), if (!g_value_type_compatible (G_PARAM_SPEC_VALUE_TYPE (pspec),
clutter_interval_get_value_type (interval))) clutter_interval_get_value_type (interval)))
{ {
g_warning ("Cannot bind property `%s': the interval value of " g_warning ("Cannot bind property '%s': the interval value of "
"type `%s' is not compatible with the property value " "type '%s' is not compatible with the property value "
"of type `%s'", "of type '%s'",
property_name, property_name,
g_type_name (clutter_interval_get_value_type (interval)), g_type_name (clutter_interval_get_value_type (interval)),
g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec))); g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)));
@ -773,7 +773,7 @@ on_alpha_notify (GObject *gobject,
initial = clutter_interval_peek_initial_value (interval); initial = clutter_interval_peek_initial_value (interval);
final = clutter_interval_peek_final_value (interval); final = clutter_interval_peek_final_value (interval);
CLUTTER_NOTE (ANIMATION, "Animatable property `%s'", p_name); CLUTTER_NOTE (ANIMATION, "Animatable property '%s'", p_name);
clutter_animatable_animate_property (animatable, animation, clutter_animatable_animate_property (animatable, animation,
p_name, p_name,
initial, final, initial, final,
@ -784,7 +784,7 @@ on_alpha_notify (GObject *gobject,
} }
else else
{ {
CLUTTER_NOTE (ANIMATION, "Standard property `%s'", p_name); CLUTTER_NOTE (ANIMATION, "Standard property '%s'", p_name);
if (clutter_interval_compute_value (interval, alpha_value, &value)) if (clutter_interval_compute_value (interval, alpha_value, &value))
g_object_set_property (priv->object, p_name, &value); g_object_set_property (priv->object, p_name, &value);
@ -1280,7 +1280,7 @@ clutter_animation_setup_property (ClutterAnimation *animation,
if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
{ {
g_warning ("Cannot bind property `%s': the property is " g_warning ("Cannot bind property '%s': the property is "
"construct-only", "construct-only",
property_name); property_name);
return; return;
@ -1288,7 +1288,7 @@ clutter_animation_setup_property (ClutterAnimation *animation,
if (!(pspec->flags & G_PARAM_WRITABLE)) if (!(pspec->flags & G_PARAM_WRITABLE))
{ {
g_warning ("Cannot bind property `%s': the property is " g_warning ("Cannot bind property '%s': the property is "
"not writable", "not writable",
property_name); property_name);
return; return;
@ -1311,7 +1311,7 @@ clutter_animation_setup_property (ClutterAnimation *animation,
G_VALUE_TYPE (value))) G_VALUE_TYPE (value)))
{ {
g_warning ("%s: Unable to convert from %s to %s for " g_warning ("%s: Unable to convert from %s to %s for "
"the property `%s' of object %s", "the property '%s' of object %s",
G_STRLOC, G_STRLOC,
g_type_name (G_VALUE_TYPE (value)), g_type_name (G_VALUE_TYPE (value)),
g_type_name (G_VALUE_TYPE (&real_value)), g_type_name (G_VALUE_TYPE (&real_value)),
@ -1390,7 +1390,7 @@ clutter_animation_setupv (ClutterAnimation *animation,
pspec = g_object_class_find_property (klass, property_name); pspec = g_object_class_find_property (klass, property_name);
if (!pspec) if (!pspec)
{ {
g_warning ("Cannot bind property `%s': objects of type `%s' do " g_warning ("Cannot bind property '%s': objects of type '%s' do "
"not have this property", "not have this property",
property_name, property_name,
g_type_name (G_OBJECT_TYPE (priv->object))); g_type_name (G_OBJECT_TYPE (priv->object)));
@ -1427,7 +1427,7 @@ clutter_animation_setup_valist (ClutterAnimation *animation,
pspec = g_object_class_find_property (klass, property_name); pspec = g_object_class_find_property (klass, property_name);
if (!pspec) if (!pspec)
{ {
g_warning ("Cannot bind property `%s': objects of type `%s' do " g_warning ("Cannot bind property '%s': objects of type '%s' do "
"not have this property", "not have this property",
property_name, property_name,
g_type_name (G_OBJECT_TYPE (priv->object))); g_type_name (G_OBJECT_TYPE (priv->object)));

2
clutter/clutter-behaviour.c
View File

@ -242,7 +242,7 @@ static void
clutter_behaviour_alpha_notify_unimplemented (ClutterBehaviour *behaviour, clutter_behaviour_alpha_notify_unimplemented (ClutterBehaviour *behaviour,
gdouble alpha_value) gdouble alpha_value)
{ {
g_warning ("ClutterBehaviourClass::alpha_notify not implemented for `%s'", g_warning ("ClutterBehaviourClass::alpha_notify not implemented for '%s'",
g_type_name (G_TYPE_FROM_INSTANCE (behaviour))); g_type_name (G_TYPE_FROM_INSTANCE (behaviour)));
} }

2
clutter/clutter-color.c
View File

@ -702,7 +702,7 @@ clutter_value_lcopy_color (const GValue *value,
ClutterColor **color_p = collect_values[0].v_pointer; ClutterColor **color_p = collect_values[0].v_pointer;
if (!color_p) if (!color_p)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
if (!value->data[0].v_pointer) if (!value->data[0].v_pointer)

54
clutter/clutter-container.c
View File

@ -45,7 +45,7 @@
#define CLUTTER_CONTAINER_WARN_NOT_IMPLEMENTED(container,vfunc) \ #define CLUTTER_CONTAINER_WARN_NOT_IMPLEMENTED(container,vfunc) \
G_STMT_START { \ G_STMT_START { \
g_warning ("Container of type `%s' does not implement " \ g_warning ("Container of type '%s' does not implement " \
"the required ClutterContainer::%s virtual " \ "the required ClutterContainer::%s virtual " \
"function.", \ "function.", \
G_OBJECT_TYPE_NAME ((container)), \ G_OBJECT_TYPE_NAME ((container)), \
@ -54,7 +54,7 @@
#define CLUTTER_CONTAINER_NOTE_NOT_IMPLEMENTED(container,vfunc) \ #define CLUTTER_CONTAINER_NOTE_NOT_IMPLEMENTED(container,vfunc) \
G_STMT_START { \ G_STMT_START { \
CLUTTER_NOTE (ACTOR, "Container of type `%s' does not " \ CLUTTER_NOTE (ACTOR, "Container of type '%s' does not " \
"implement the ClutterContainer::%s " \ "implement the ClutterContainer::%s " \
"virtual function.", \ "virtual function.", \
G_OBJECT_TYPE_NAME ((container)), \ G_OBJECT_TYPE_NAME ((container)), \
@ -265,9 +265,9 @@ clutter_container_add_actor (ClutterContainer *container,
parent = clutter_actor_get_parent (actor); parent = clutter_actor_get_parent (actor);
if (parent) if (parent)
{ {
g_warning ("Attempting to add actor of type `%s' to a " g_warning ("Attempting to add actor of type '%s' to a "
"container of type `%s', but the actor has " "container of type '%s', but the actor has "
"already a parent of type `%s'.", "already a parent of type '%s'.",
g_type_name (G_OBJECT_TYPE (actor)), g_type_name (G_OBJECT_TYPE (actor)),
g_type_name (G_OBJECT_TYPE (container)), g_type_name (G_OBJECT_TYPE (container)),
g_type_name (G_OBJECT_TYPE (parent))); g_type_name (G_OBJECT_TYPE (parent)));
@ -368,8 +368,8 @@ clutter_container_remove_actor (ClutterContainer *container,
parent = clutter_actor_get_parent (actor); parent = clutter_actor_get_parent (actor);
if (parent != CLUTTER_ACTOR (container)) if (parent != CLUTTER_ACTOR (container))
{ {
g_warning ("Attempting to remove actor of type `%s' from " g_warning ("Attempting to remove actor of type '%s' from "
"group of class `%s', but the container is not " "group of class '%s', but the container is not "
"the actor's parent.", "the actor's parent.",
g_type_name (G_OBJECT_TYPE (actor)), g_type_name (G_OBJECT_TYPE (actor)),
g_type_name (G_OBJECT_TYPE (container))); g_type_name (G_OBJECT_TYPE (container)));
@ -506,8 +506,8 @@ clutter_container_raise_child (ClutterContainer *container,
if (clutter_actor_get_parent (actor) != CLUTTER_ACTOR (container)) if (clutter_actor_get_parent (actor) != CLUTTER_ACTOR (container))
{ {
g_warning ("Actor of type `%s' is not a child of the container " g_warning ("Actor of type '%s' is not a child of the container "
"of type `%s'", "of type '%s'",
g_type_name (G_OBJECT_TYPE (actor)), g_type_name (G_OBJECT_TYPE (actor)),
g_type_name (G_OBJECT_TYPE (container))); g_type_name (G_OBJECT_TYPE (container)));
return; return;
@ -516,8 +516,8 @@ clutter_container_raise_child (ClutterContainer *container,
if (sibling && if (sibling &&
clutter_actor_get_parent (sibling) != CLUTTER_ACTOR (container)) clutter_actor_get_parent (sibling) != CLUTTER_ACTOR (container))
{ {
g_warning ("Actor of type `%s' is not a child of the container " g_warning ("Actor of type '%s' is not a child of the container "
"of type `%s'", "of type '%s'",
g_type_name (G_OBJECT_TYPE (sibling)), g_type_name (G_OBJECT_TYPE (sibling)),
g_type_name (G_OBJECT_TYPE (container))); g_type_name (G_OBJECT_TYPE (container)));
return; return;
@ -559,8 +559,8 @@ clutter_container_lower_child (ClutterContainer *container,
if (clutter_actor_get_parent (actor) != CLUTTER_ACTOR (container)) if (clutter_actor_get_parent (actor) != CLUTTER_ACTOR (container))
{ {
g_warning ("Actor of type `%s' is not a child of the container " g_warning ("Actor of type '%s' is not a child of the container "
"of type `%s'", "of type '%s'",
g_type_name (G_OBJECT_TYPE (actor)), g_type_name (G_OBJECT_TYPE (actor)),
g_type_name (G_OBJECT_TYPE (container))); g_type_name (G_OBJECT_TYPE (container)));
return; return;
@ -569,8 +569,8 @@ clutter_container_lower_child (ClutterContainer *container,
if (sibling && if (sibling &&
clutter_actor_get_parent (sibling) != CLUTTER_ACTOR (container)) clutter_actor_get_parent (sibling) != CLUTTER_ACTOR (container))
{ {
g_warning ("Actor of type `%s' is not a child of the container " g_warning ("Actor of type '%s' is not a child of the container "
"of type `%s'", "of type '%s'",
g_type_name (G_OBJECT_TYPE (sibling)), g_type_name (G_OBJECT_TYPE (sibling)),
g_type_name (G_OBJECT_TYPE (container))); g_type_name (G_OBJECT_TYPE (container)));
return; return;
@ -696,7 +696,7 @@ create_child_meta (ClutterContainer *container,
if (!g_type_is_a (iface->child_meta_type, CLUTTER_TYPE_CHILD_META)) if (!g_type_is_a (iface->child_meta_type, CLUTTER_TYPE_CHILD_META))
{ {
g_warning ("%s: Child data of type `%s' is not a ClutterChildMeta", g_warning ("%s: Child data of type '%s' is not a ClutterChildMeta",
G_STRLOC, g_type_name (iface->child_meta_type)); G_STRLOC, g_type_name (iface->child_meta_type));
return; return;
} }
@ -944,15 +944,15 @@ clutter_container_child_set_property (ClutterContainer *container,
pspec = clutter_container_class_find_child_property (klass, property); pspec = clutter_container_class_find_child_property (klass, property);
if (!pspec) if (!pspec)
{ {
g_warning ("%s: Containers of type `%s' have no child " g_warning ("%s: Containers of type '%s' have no child "
"property named `%s'", "property named '%s'",
G_STRLOC, G_OBJECT_TYPE_NAME (container), property); G_STRLOC, G_OBJECT_TYPE_NAME (container), property);
return; return;
} }
if (!(pspec->flags & G_PARAM_WRITABLE)) if (!(pspec->flags & G_PARAM_WRITABLE))
{ {
g_warning ("%s: Child property `%s' of the container `%s' " g_warning ("%s: Child property '%s' of the container '%s' "
"is not writable", "is not writable",
G_STRLOC, pspec->name, G_OBJECT_TYPE_NAME (container)); G_STRLOC, pspec->name, G_OBJECT_TYPE_NAME (container));
return; return;
@ -1000,15 +1000,15 @@ clutter_container_child_set (ClutterContainer *container,
pspec = clutter_container_class_find_child_property (klass, name); pspec = clutter_container_class_find_child_property (klass, name);
if (!pspec) if (!pspec)
{ {
g_warning ("%s: Containers of type `%s' have no child " g_warning ("%s: Containers of type '%s' have no child "
"property named `%s'", "property named '%s'",
G_STRLOC, G_OBJECT_TYPE_NAME (container), name); G_STRLOC, G_OBJECT_TYPE_NAME (container), name);
break; break;
} }
if (!(pspec->flags & G_PARAM_WRITABLE)) if (!(pspec->flags & G_PARAM_WRITABLE))
{ {
g_warning ("%s: Child property `%s' of the container `%s' " g_warning ("%s: Child property '%s' of the container '%s' "
"is not writable", "is not writable",
G_STRLOC, pspec->name, G_OBJECT_TYPE_NAME (container)); G_STRLOC, pspec->name, G_OBJECT_TYPE_NAME (container));
break; break;
@ -1085,15 +1085,15 @@ clutter_container_child_get_property (ClutterContainer *container,
pspec = clutter_container_class_find_child_property (klass, property); pspec = clutter_container_class_find_child_property (klass, property);
if (!pspec) if (!pspec)
{ {
g_warning ("%s: Containers of type `%s' have no child " g_warning ("%s: Containers of type '%s' have no child "
"property named `%s'", "property named '%s'",
G_STRLOC, G_OBJECT_TYPE_NAME (container), property); G_STRLOC, G_OBJECT_TYPE_NAME (container), property);
return; return;
} }
if (!(pspec->flags & G_PARAM_READABLE)) if (!(pspec->flags & G_PARAM_READABLE))
{ {
g_warning ("%s: Child property `%s' of the container `%s' " g_warning ("%s: Child property '%s' of the container '%s' "
"is not writable", "is not writable",
G_STRLOC, pspec->name, G_OBJECT_TYPE_NAME (container)); G_STRLOC, pspec->name, G_OBJECT_TYPE_NAME (container));
return; return;
@ -1146,14 +1146,14 @@ clutter_container_child_get (ClutterContainer *container,
pspec = clutter_container_class_find_child_property (klass, name); pspec = clutter_container_class_find_child_property (klass, name);
if (!pspec) if (!pspec)
{ {
g_warning ("%s: container `%s' has no child property named `%s'", g_warning ("%s: container '%s' has no child property named '%s'",
G_STRLOC, G_OBJECT_TYPE_NAME (container), name); G_STRLOC, G_OBJECT_TYPE_NAME (container), name);
break; break;
} }
if (!(pspec->flags & G_PARAM_READABLE)) if (!(pspec->flags & G_PARAM_READABLE))
{ {
g_warning ("%s: child property `%s' of container `%s' is not readable", g_warning ("%s: child property '%s' of container '%s' is not readable",
G_STRLOC, pspec->name, G_OBJECT_TYPE_NAME (container)); G_STRLOC, pspec->name, G_OBJECT_TYPE_NAME (container));
break; break;
} }

14
clutter/clutter-model.c
View File

@ -1423,7 +1423,7 @@ clutter_model_iter_get_value_unimplemented (ClutterModelIter *iter,
guint column, guint column,
GValue *value) GValue *value)
{ {
g_warning ("%s: Iterator of type `%s' does not implement the " g_warning ("%s: Iterator of type '%s' does not implement the "
"ClutterModelIter::get_value() virtual function", "ClutterModelIter::get_value() virtual function",
G_STRLOC, G_STRLOC,
g_type_name (G_OBJECT_TYPE (iter))); g_type_name (G_OBJECT_TYPE (iter)));
@ -1434,7 +1434,7 @@ clutter_model_iter_set_value_unimplemented (ClutterModelIter *iter,
guint column, guint column,
const GValue *value) const GValue *value)
{ {
g_warning ("%s: Iterator of type `%s' does not implement the " g_warning ("%s: Iterator of type '%s' does not implement the "
"ClutterModelIter::set_value() virtual function", "ClutterModelIter::set_value() virtual function",
G_STRLOC, G_STRLOC,
g_type_name (G_OBJECT_TYPE (iter))); g_type_name (G_OBJECT_TYPE (iter)));
@ -1443,7 +1443,7 @@ clutter_model_iter_set_value_unimplemented (ClutterModelIter *iter,
static gboolean static gboolean
clutter_model_iter_is_first_unimplemented (ClutterModelIter *iter) clutter_model_iter_is_first_unimplemented (ClutterModelIter *iter)
{ {
g_warning ("%s: Iterator of type `%s' does not implement the " g_warning ("%s: Iterator of type '%s' does not implement the "
"ClutterModelIter::is_first() virtual function", "ClutterModelIter::is_first() virtual function",
G_STRLOC, G_STRLOC,
g_type_name (G_OBJECT_TYPE (iter))); g_type_name (G_OBJECT_TYPE (iter)));
@ -1453,7 +1453,7 @@ clutter_model_iter_is_first_unimplemented (ClutterModelIter *iter)
static gboolean static gboolean
clutter_model_iter_is_last_unimplemented (ClutterModelIter *iter) clutter_model_iter_is_last_unimplemented (ClutterModelIter *iter)
{ {
g_warning ("%s: Iterator of type `%s' does not implement the " g_warning ("%s: Iterator of type '%s' does not implement the "
"ClutterModelIter::is_last() virtual function", "ClutterModelIter::is_last() virtual function",
G_STRLOC, G_STRLOC,
g_type_name (G_OBJECT_TYPE (iter))); g_type_name (G_OBJECT_TYPE (iter)));
@ -1463,7 +1463,7 @@ clutter_model_iter_is_last_unimplemented (ClutterModelIter *iter)
static ClutterModelIter * static ClutterModelIter *
clutter_model_iter_next_unimplemented (ClutterModelIter *iter) clutter_model_iter_next_unimplemented (ClutterModelIter *iter)
{ {
g_warning ("%s: Iterator of type `%s' does not implement the " g_warning ("%s: Iterator of type '%s' does not implement the "
"ClutterModelIter::next() virtual function", "ClutterModelIter::next() virtual function",
G_STRLOC, G_STRLOC,
g_type_name (G_OBJECT_TYPE (iter))); g_type_name (G_OBJECT_TYPE (iter)));
@ -1473,7 +1473,7 @@ clutter_model_iter_next_unimplemented (ClutterModelIter *iter)
static ClutterModelIter * static ClutterModelIter *
clutter_model_iter_prev_unimplemented (ClutterModelIter *iter) clutter_model_iter_prev_unimplemented (ClutterModelIter *iter)
{ {
g_warning ("%s: Iterator of type `%s' does not implement the " g_warning ("%s: Iterator of type '%s' does not implement the "
"ClutterModelIter::prev() virtual function", "ClutterModelIter::prev() virtual function",
G_STRLOC, G_STRLOC,
g_type_name (G_OBJECT_TYPE (iter))); g_type_name (G_OBJECT_TYPE (iter)));
@ -1483,7 +1483,7 @@ clutter_model_iter_prev_unimplemented (ClutterModelIter *iter)
static ClutterModelIter * static ClutterModelIter *
clutter_model_iter_copy_unimplemented (ClutterModelIter *iter) clutter_model_iter_copy_unimplemented (ClutterModelIter *iter)
{ {
g_warning ("%s: Iterator of type `%s' does not implement the " g_warning ("%s: Iterator of type '%s' does not implement the "
"ClutterModelIter::copy() virtual function", "ClutterModelIter::copy() virtual function",
G_STRLOC, G_STRLOC,
g_type_name (G_OBJECT_TYPE (iter))); g_type_name (G_OBJECT_TYPE (iter)));

2
clutter/clutter-score.c
View File

@ -971,7 +971,7 @@ clutter_score_append_at_marker (ClutterScore *score,
if (!clutter_timeline_has_marker (parent, marker_name)) if (!clutter_timeline_has_marker (parent, marker_name))
{ {
g_warning ("The parent timeline has no marker `%s'", marker_name); g_warning ("The parent timeline has no marker '%s'", marker_name);
return 0; return 0;
} }

30
clutter/clutter-script.c
View File

@ -227,7 +227,7 @@ warn_missing_attribute (ClutterScript *script,
if (G_LIKELY (id)) if (G_LIKELY (id))
{ {
g_warning ("%s:%d: object `%s' has no `%s' attribute", g_warning ("%s:%d: object '%s' has no '%s' attribute",
priv->is_filename ? priv->filename : "<input>", priv->is_filename ? priv->filename : "<input>",
json_parser_get_current_line (priv->parser), json_parser_get_current_line (priv->parser),
id, id,
@ -235,7 +235,7 @@ warn_missing_attribute (ClutterScript *script,
} }
else else
{ {
g_warning ("%s:%d: object has no `%s' attribute", g_warning ("%s:%d: object has no '%s' attribute",
priv->is_filename ? priv->filename : "<input>", priv->is_filename ? priv->filename : "<input>",
json_parser_get_current_line (priv->parser), json_parser_get_current_line (priv->parser),
attribute); attribute);
@ -252,8 +252,8 @@ warn_invalid_value (ClutterScript *script,
if (G_LIKELY (node)) if (G_LIKELY (node))
{ {
g_warning ("%s:%d: invalid value of type `%s' for attribute `%s':" g_warning ("%s:%d: invalid value of type '%s' for attribute '%s':"
"a value of type `%s' is expected", "a value of type '%s' is expected",
priv->is_filename ? priv->filename : "<input>", priv->is_filename ? priv->filename : "<input>",
json_parser_get_current_line (priv->parser), json_parser_get_current_line (priv->parser),
json_node_type_name (node), json_node_type_name (node),
@ -262,8 +262,8 @@ warn_invalid_value (ClutterScript *script,
} }
else else
{ {
g_warning ("%s:%d: invalid value for attribute `%s':" g_warning ("%s:%d: invalid value for attribute '%s':"
"a value of type `%s' is expected", "a value of type '%s' is expected",
priv->is_filename ? priv->filename : "<input>", priv->is_filename ? priv->filename : "<input>",
json_parser_get_current_line (priv->parser), json_parser_get_current_line (priv->parser),
attribute, attribute,
@ -432,7 +432,7 @@ parse_signals (ClutterScript *script,
} }
CLUTTER_NOTE (SCRIPT, CLUTTER_NOTE (SCRIPT,
"Parsing signal `%s' (handler:%s, object:%s, flags:%d)", "Parsing signal '%s' (handler:%s, object:%s, flags:%d)",
name, name,
handler, connect, flags); handler, connect, flags);
@ -587,14 +587,14 @@ resolve_alpha_func (const gchar *name)
static GModule *module = NULL; static GModule *module = NULL;
ClutterAlphaFunc func; ClutterAlphaFunc func;
CLUTTER_NOTE (SCRIPT, "Looking up `%s' alpha function", name); CLUTTER_NOTE (SCRIPT, "Looking up '%s' alpha function", name);
if (G_UNLIKELY (!module)) if (G_UNLIKELY (!module))
module = g_module_open (NULL, G_MODULE_BIND_LAZY); module = g_module_open (NULL, G_MODULE_BIND_LAZY);
if (g_module_symbol (module, name, (gpointer) &func)) if (g_module_symbol (module, name, (gpointer) &func))
{ {
CLUTTER_NOTE (SCRIPT, "Found `%s' alpha function in the symbols table", CLUTTER_NOTE (SCRIPT, "Found '%s' alpha function in the symbols table",
name); name);
return func; return func;
} }
@ -649,7 +649,7 @@ clutter_script_parse_alpha (ClutterScript *script,
alpha_func = resolve_alpha_func (json_node_get_string (val)); alpha_func = resolve_alpha_func (json_node_get_string (val));
if (!alpha_func) if (!alpha_func)
{ {
g_warning ("Unable to find the function `%s' in the " g_warning ("Unable to find the function '%s' in the "
"Clutter alpha functions or the symbols table", "Clutter alpha functions or the symbols table",
json_node_get_string (val)); json_node_get_string (val));
} }
@ -801,7 +801,7 @@ json_object_end (JsonParser *parser,
g_list_free (members); g_list_free (members);
CLUTTER_NOTE (SCRIPT, CLUTTER_NOTE (SCRIPT,
"Added object `%s' (type:%s, id:%d, props:%d, signals:%d)", "Added object '%s' (type:%s, id:%d, props:%d, signals:%d)",
oinfo->id, oinfo->id,
oinfo->class_name, oinfo->class_name,
oinfo->merge_id, oinfo->merge_id,
@ -1090,7 +1090,7 @@ clutter_script_parse_node (ClutterScript *script,
pixbuf = gdk_pixbuf_new_from_file (path, &error); pixbuf = gdk_pixbuf_new_from_file (path, &error);
if (error) if (error)
{ {
g_warning ("Unable to open image at path `%s': %s", g_warning ("Unable to open image at path '%s': %s",
path, path,
error->message); error->message);
g_error_free (error); g_error_free (error);
@ -1292,7 +1292,7 @@ apply_behaviours (ClutterScript *script,
continue; continue;
} }
CLUTTER_NOTE (SCRIPT, "Applying behaviour `%s' to actor of type `%s'", CLUTTER_NOTE (SCRIPT, "Applying behaviour '%s' to actor of type '%s'",
name, name,
g_type_name (G_OBJECT_TYPE (actor))); g_type_name (G_OBJECT_TYPE (actor)));
@ -1334,7 +1334,7 @@ add_children (ClutterScript *script,
continue; continue;
} }
CLUTTER_NOTE (SCRIPT, "Adding children `%s' to actor of type `%s'", CLUTTER_NOTE (SCRIPT, "Adding children '%s' to actor of type '%s'",
name, name,
g_type_name (G_OBJECT_TYPE (container))); g_type_name (G_OBJECT_TYPE (container)));
@ -1476,7 +1476,7 @@ clutter_script_construct_object (ClutterScript *script,
GParameter *param = &g_array_index (params, GParameter, i); GParameter *param = &g_array_index (params, GParameter, i);
CLUTTER_NOTE (SCRIPT, CLUTTER_NOTE (SCRIPT,
"Setting %s property `%s' (type:%s) to object `%s' (id:%s)", "Setting %s property '%s' (type:%s) to object '%s' (id:%s)",
set_custom_property ? "custom" : "regular", set_custom_property ? "custom" : "regular",
param->name, param->name,
g_type_name (G_VALUE_TYPE (&param->value)), g_type_name (G_VALUE_TYPE (&param->value)),

12
clutter/clutter-shader-types.c
View File

@ -135,7 +135,7 @@ clutter_value_collect_shader_float (GValue *value,
const float *floats = collect_values[1].v_pointer; const float *floats = collect_values[1].v_pointer;
if (!floats) if (!floats)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
clutter_value_init_shader_float (value); clutter_value_init_shader_float (value);
@ -155,7 +155,7 @@ clutter_value_lcopy_shader_float (const GValue *value,
ClutterShaderFloat *shader_float = value->data[0].v_pointer; ClutterShaderFloat *shader_float = value->data[0].v_pointer;
if (!float_count || !floats) if (!float_count || !floats)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
*float_count = shader_float->size; *float_count = shader_float->size;
@ -226,7 +226,7 @@ clutter_value_collect_shader_int (GValue *value,
const COGLint *ints = collect_values[1].v_pointer; const COGLint *ints = collect_values[1].v_pointer;
if (!ints) if (!ints)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
clutter_value_init_shader_int (value); clutter_value_init_shader_int (value);
@ -246,7 +246,7 @@ clutter_value_lcopy_shader_int (const GValue *value,
ClutterShaderInt *shader_int = value->data[0].v_pointer; ClutterShaderInt *shader_int = value->data[0].v_pointer;
if (!int_count || !ints) if (!int_count || !ints)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
*int_count = shader_int->size; *int_count = shader_int->size;
@ -317,7 +317,7 @@ clutter_value_collect_shader_matrix (GValue *value,
const float *floats = collect_values[1].v_pointer; const float *floats = collect_values[1].v_pointer;
if (!floats) if (!floats)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
clutter_value_init_shader_matrix (value); clutter_value_init_shader_matrix (value);
@ -337,7 +337,7 @@ clutter_value_lcopy_shader_matrix (const GValue *value,
ClutterShaderFloat *shader_float = value->data[0].v_pointer; ClutterShaderFloat *shader_float = value->data[0].v_pointer;
if (!float_count || !floats) if (!float_count || !floats)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
*float_count = shader_float->size; *float_count = shader_float->size;

8
clutter/clutter-text.c
View File

@ -1116,7 +1116,7 @@ clutter_text_paint (ClutterActor *self)
* priv->text_color.alpha * priv->text_color.alpha
/ 255; / 255;
CLUTTER_NOTE (PAINT, "painting text (text:`%s')", priv->text); CLUTTER_NOTE (PAINT, "painting text (text: '%s')", priv->text);
cogl_color_set_from_4ub (&color, cogl_color_set_from_4ub (&color,
priv->text_color.red, priv->text_color.red,
@ -2725,7 +2725,7 @@ clutter_text_set_font_name (ClutterText *self,
if (!desc) if (!desc)
{ {
g_warning ("Attempting to create a PangoFontDescription for " g_warning ("Attempting to create a PangoFontDescription for "
"font name `%s', but failed.", "font name '%s', but failed.",
font_name); font_name);
return; return;
} }
@ -2855,13 +2855,13 @@ clutter_text_set_markup_internal (ClutterText *self,
{ {
if (G_LIKELY (error)) if (G_LIKELY (error))
{ {
g_warning ("Failed to set the markup of the actor of class `%s': %s", g_warning ("Failed to set the markup of the actor of class '%s': %s",
G_OBJECT_TYPE_NAME (self), G_OBJECT_TYPE_NAME (self),
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
else else
g_warning ("Failed to set the markup of the actor of class `%s'", g_warning ("Failed to set the markup of the actor of class '%s'",
G_OBJECT_TYPE_NAME (self)); G_OBJECT_TYPE_NAME (self));
return; return;

2
clutter/clutter-texture.c
View File

@ -1172,7 +1172,7 @@ clutter_texture_set_custom_property (ClutterScriptable *scriptable,
clutter_texture_set_from_file (texture, path, &error); clutter_texture_set_from_file (texture, path, &error);
if (error) if (error)
{ {
g_warning ("Unable to open image path at `%s': %s", g_warning ("Unable to open image path at '%s': %s",
path, path,
error->message); error->message);
g_error_free (error); g_error_free (error);

12
clutter/clutter-timeline.c
View File

@ -614,7 +614,7 @@ emit_frame_signal (ClutterTimeline *timeline)
{ {
TimelineMarker *marker = l->data; TimelineMarker *marker = l->data;
CLUTTER_NOTE (SCHEDULER, "Marker `%s' reached", marker->name); CLUTTER_NOTE (SCHEDULER, "Marker '%s' reached", marker->name);
g_signal_emit (timeline, timeline_signals[MARKER_REACHED], g_signal_emit (timeline, timeline_signals[MARKER_REACHED],
marker->quark, marker->quark,
@ -1517,7 +1517,7 @@ clutter_timeline_add_marker_internal (ClutterTimeline *timeline,
marker = g_hash_table_lookup (priv->markers_by_name, marker_name); marker = g_hash_table_lookup (priv->markers_by_name, marker_name);
if (G_UNLIKELY (marker)) if (G_UNLIKELY (marker))
{ {
g_warning ("A marker named `%s' already exists on frame %d", g_warning ("A marker named '%s' already exists on frame %d",
marker->name, marker->name,
marker->frame_num); marker->frame_num);
return; return;
@ -1697,14 +1697,14 @@ clutter_timeline_advance_to_marker (ClutterTimeline *timeline,
if (G_UNLIKELY (priv->markers_by_name == NULL || if (G_UNLIKELY (priv->markers_by_name == NULL ||
priv->markers_by_frame == NULL)) priv->markers_by_frame == NULL))
{ {
g_warning ("No marker named `%s' found.", marker_name); g_warning ("No marker named '%s' found.", marker_name);
return; return;
} }
marker = g_hash_table_lookup (priv->markers_by_name, marker_name); marker = g_hash_table_lookup (priv->markers_by_name, marker_name);
if (!marker) if (!marker)
{ {
g_warning ("No marker named `%s' found.", marker_name); g_warning ("No marker named '%s' found.", marker_name);
return; return;
} }
@ -1736,14 +1736,14 @@ clutter_timeline_remove_marker (ClutterTimeline *timeline,
if (G_UNLIKELY (priv->markers_by_name == NULL || if (G_UNLIKELY (priv->markers_by_name == NULL ||
priv->markers_by_frame == NULL)) priv->markers_by_frame == NULL))
{ {
g_warning ("No marker named `%s' found.", marker_name); g_warning ("No marker named '%s' found.", marker_name);
return; return;
} }
marker = g_hash_table_lookup (priv->markers_by_name, marker_name); marker = g_hash_table_lookup (priv->markers_by_name, marker_name);
if (!marker) if (!marker)
{ {
g_warning ("No marker named `%s' found.", marker_name); g_warning ("No marker named '%s' found.", marker_name);
return; return;
} }

2
clutter/clutter-units.c
View File

@ -260,7 +260,7 @@ clutter_value_lcopy_unit (const GValue *value,
gfloat *units_p = collect_values[0].v_pointer; gfloat *units_p = collect_values[0].v_pointer;
if (!units_p) if (!units_p)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
*units_p = value->data[0].v_float; *units_p = value->data[0].v_float;

2
clutter/cogl/common/cogl-util.c
View File

@ -326,7 +326,7 @@ cogl_value_lcopy_fixed (const GValue *value,
gint32 *fixed_p = collect_values[0].v_pointer; gint32 *fixed_p = collect_values[0].v_pointer;
if (!fixed_p) if (!fixed_p)
return g_strdup_printf ("value location for `%s' passed as NULL", return g_strdup_printf ("value location for '%s' passed as NULL",
G_VALUE_TYPE_NAME (value)); G_VALUE_TYPE_NAME (value));
*fixed_p = value->data[0].v_int; *fixed_p = value->data[0].v_int;

2
clutter/eglnative/clutter-stage-egl.c
View File

@ -278,7 +278,7 @@ static void
clutter_stage_egl_set_fullscreen (ClutterStageWindow *stage_window, clutter_stage_egl_set_fullscreen (ClutterStageWindow *stage_window,
gboolean fullscreen) gboolean fullscreen)
{ {
g_warning ("Stage of type `%s' do not support ClutterStage::set_fullscreen", g_warning ("Stage of type '%s' do not support ClutterStage::set_fullscreen",
G_OBJECT_TYPE_NAME (stage_window)); G_OBJECT_TYPE_NAME (stage_window));
} }

2
clutter/eglx/clutter-backend-egl.c
View File

@ -240,7 +240,7 @@ clutter_backend_egl_create_stage (ClutterBackend *backend,
ClutterStageX11 *stage_x11; ClutterStageX11 *stage_x11;
ClutterActor *stage; ClutterActor *stage;
CLUTTER_NOTE (BACKEND, "Creating stage of type `%s'", CLUTTER_NOTE (BACKEND, "Creating stage of type '%s'",
g_type_name (CLUTTER_STAGE_TYPE)); g_type_name (CLUTTER_STAGE_TYPE));
stage = g_object_new (CLUTTER_STAGE_TYPE, NULL); stage = g_object_new (CLUTTER_STAGE_TYPE, NULL);

2
clutter/fruity/clutter-stage-fruity.c
View File

@ -247,7 +247,7 @@ static void
clutter_stage_egl_set_fullscreen (ClutterStageWindow *stage_window, clutter_stage_egl_set_fullscreen (ClutterStageWindow *stage_window,
gboolean fullscreen) gboolean fullscreen)
{ {
g_warning ("Stage of type `%s' do not support ClutterStage::set_fullscreen", g_warning ("Stage of type '%s' do not support ClutterStage::set_fullscreen",
G_OBJECT_TYPE_NAME (stage_window)); G_OBJECT_TYPE_NAME (stage_window));
} }

2
clutter/glx/clutter-backend-glx.c
View File

@ -470,7 +470,7 @@ clutter_backend_glx_create_stage (ClutterBackend *backend,
ClutterStageX11 *stage_x11; ClutterStageX11 *stage_x11;
ClutterActor *stage; ClutterActor *stage;
CLUTTER_NOTE (BACKEND, "Creating stage of type `%s'", CLUTTER_NOTE (BACKEND, "Creating stage of type '%s'",
g_type_name (CLUTTER_STAGE_TYPE)); g_type_name (CLUTTER_STAGE_TYPE));
stage = g_object_new (CLUTTER_TYPE_STAGE_GLX, NULL); stage = g_object_new (CLUTTER_TYPE_STAGE_GLX, NULL);

2
clutter/json/json-object.c
View File

@ -155,7 +155,7 @@ json_object_add_member (JsonObject *object,
if (json_object_has_member (object, member_name)) if (json_object_has_member (object, member_name))
{ {
g_warning ("JsonObject already has a `%s' member of type `%s'", g_warning ("JsonObject already has a '%s' member of type '%s'",
member_name, member_name,
json_node_type_name (node)); json_node_type_name (node));
return; return;

13
clutter/json/json-parser.c
View File

@ -949,7 +949,7 @@ json_parser_load_from_data (JsonParser *parser,
symbol_name = symbol_names + symbols[i].name_offset; symbol_name = symbol_names + symbols[i].name_offset;
if (msg) if (msg)
msg = g_strconcat ("e.g. `", symbol_name, "'", NULL); msg = g_strconcat ("e.g. '", symbol_name, "'", NULL);
} }
if (scanner->token > JSON_TOKEN_INVALID && if (scanner->token > JSON_TOKEN_INVALID &&
@ -976,16 +976,7 @@ json_parser_load_from_data (JsonParser *parser,
g_propagate_error (error, parser->priv->last_error); g_propagate_error (error, parser->priv->last_error);
parser->priv->last_error = NULL; parser->priv->last_error = NULL;
} }
#if 0
/* we set a generic error here; the message from
* GScanner is relayed in the ::error signal
*/
g_set_error (error, JSON_PARSER_ERROR,
JSON_PARSER_ERROR_PARSE,
"Invalid token `%s' found: expecting %s",
symbol_name ? symbol_name : "???",
msg ? msg : "unknown");
#endif
retval = FALSE; retval = FALSE;
g_free (msg); g_free (msg);

2
clutter/win32/clutter-backend-win32.c
View File

@ -313,7 +313,7 @@ clutter_backend_win32_create_stage (ClutterBackend *backend,
ClutterStageWin32 *stage_win32; ClutterStageWin32 *stage_win32;
ClutterActor *stage; ClutterActor *stage;
CLUTTER_NOTE (BACKEND, "Creating stage of type `%s'", CLUTTER_NOTE (BACKEND, "Creating stage of type '%s'",
g_type_name (CLUTTER_STAGE_TYPE)); g_type_name (CLUTTER_STAGE_TYPE));
stage = g_object_new (CLUTTER_TYPE_STAGE_WIN32, NULL); stage = g_object_new (CLUTTER_TYPE_STAGE_WIN32, NULL);

6
clutter/x11/clutter-backend-x11.c
View File

@ -137,14 +137,14 @@ clutter_backend_x11_post_parse (ClutterBackend *backend,
{ {
if (clutter_display_name) if (clutter_display_name)
{ {
CLUTTER_NOTE (BACKEND, "XOpenDisplay on `%s'", CLUTTER_NOTE (BACKEND, "XOpenDisplay on '%s'",
clutter_display_name); clutter_display_name);
backend_x11->xdpy = XOpenDisplay (clutter_display_name); backend_x11->xdpy = XOpenDisplay (clutter_display_name);
if (backend_x11->xdpy == None) if (backend_x11->xdpy == None)
{ {
g_set_error (error, CLUTTER_INIT_ERROR, g_set_error (error, CLUTTER_INIT_ERROR,
CLUTTER_INIT_ERROR_BACKEND, CLUTTER_INIT_ERROR_BACKEND,
"Unable to open display `%s'", "Unable to open display '%s'",
clutter_display_name); clutter_display_name);
return FALSE; return FALSE;
} }
@ -211,7 +211,7 @@ clutter_backend_x11_post_parse (ClutterBackend *backend,
g_free (clutter_display_name); g_free (clutter_display_name);
CLUTTER_NOTE (BACKEND, CLUTTER_NOTE (BACKEND,
"X Display `%s'[%p] opened (screen:%d, root:%u, dpi:%f)", "X Display '%s'[%p] opened (screen:%d, root:%u, dpi:%f)",
backend_x11->display_name, backend_x11->display_name,
backend_x11->xdpy, backend_x11->xdpy,
backend_x11->xscreen_num, backend_x11->xscreen_num,

2
tests/conform/test-timeline.c
View File

@ -70,7 +70,7 @@ timeline_marker_reached_cb (ClutterTimeline *timeline,
TimelineData *data) TimelineData *data)
{ {
if (g_test_verbose ()) if (g_test_verbose ())
g_print ("%i: Marker `%s' (%d) reached, delta = %i\n", g_print ("%i: Marker '%s' (%d) reached, delta = %i\n",
data->timeline_num, marker_name, frame_num, data->timeline_num, marker_name, frame_num,
clutter_timeline_get_delta (timeline, NULL)); clutter_timeline_get_delta (timeline, NULL));
data->markers_hit = g_slist_prepend (data->markers_hit, data->markers_hit = g_slist_prepend (data->markers_hit,

4
tests/interactive/test-score.c
View File

@ -27,7 +27,7 @@ on_timeline_started (ClutterScore *score,
for (i = 0; i < level; i++) for (i = 0; i < level; i++)
g_print (" "); g_print (" ");
g_print ("Started timeline: `%s'\n", g_print ("Started timeline: '%s'\n",
(gchar *) g_object_get_data (G_OBJECT (timeline), "timeline-name")); (gchar *) g_object_get_data (G_OBJECT (timeline), "timeline-name"));
level += 1; level += 1;
@ -44,7 +44,7 @@ on_timeline_completed (ClutterScore *score,
for (i = 0; i < level; i++) for (i = 0; i < level; i++)
g_print (" "); g_print (" ");
g_print ("Completed timeline: `%s'\n", g_print ("Completed timeline: '%s'\n",
(gchar *) g_object_get_data (G_OBJECT (timeline), "timeline-name")); (gchar *) g_object_get_data (G_OBJECT (timeline), "timeline-name"));
} }

4
tests/interactive/test-script.c
View File

@ -74,7 +74,7 @@ blue_button_press (ClutterActor *actor,
ClutterButtonEvent *event, ClutterButtonEvent *event,
gpointer data) gpointer data)
{ {
g_print ("[*] Pressed `%s'\n", clutter_get_script_id (G_OBJECT (actor))); g_print ("[*] Pressed '%s'\n", clutter_get_script_id (G_OBJECT (actor)));
g_print ("[*] Unmerging objects with merge id: %d\n", merge_id); g_print ("[*] Unmerging objects with merge id: %d\n", merge_id);
clutter_script_unmerge_objects (script, merge_id); clutter_script_unmerge_objects (script, merge_id);
@ -89,7 +89,7 @@ red_button_press (ClutterActor *actor,
{ {
GObject *timeline; GObject *timeline;
g_print ("[*] Pressed `%s'\n", clutter_get_script_id (G_OBJECT (actor))); g_print ("[*] Pressed '%s'\n", clutter_get_script_id (G_OBJECT (actor)));
timeline = clutter_script_get_object (script, "main-timeline"); timeline = clutter_script_get_object (script, "main-timeline");
g_assert (CLUTTER_IS_TIMELINE (timeline)); g_assert (CLUTTER_IS_TIMELINE (timeline));