+2008-02-04 Emmanuele Bassi <ebassi@openedhand.com>
+
+ * clutter/clutter-actor.c:
+ * clutter/clutter-shader.c: Small documentation and style fixes
+
+ * tests/test-scale.c: Constify the gravities array.
+
2008-02-04 Chris Lord <chris@openedhand.com>
* clutter/clutter-actor.c: (clutter_actor_transform_stage_point):
static void
clutter_actor_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
ClutterActor *actor;
ClutterActorPrivate *priv;
/**
* clutter_actor_get_shader:
* @self: a #ClutterActor
- * @shader: a #ClutterShader or %NULL
*
* Queries the currently set #ClutterShader on @self.
*
- * Return value: The currently set #ClutterShader or NULL if no shader is set.
+ * Return value: The currently set #ClutterShader or %NULL if no
+ * shader is set.
*
* Since: 0.6
*/
shader_data = actor_priv->shader_data;
if (!shader_data)
- {
- return NULL;
- }
+ return NULL;
+
return shader_data->shader;
}
shader_data->shader = g_object_ref (shader);
}
-
clutter_actor_queue_redraw (self);
return TRUE;
is_glsl = !g_str_has_prefix (data, "!!ARBfp");
- if (priv->fragment_source)
- {
- g_free (priv->fragment_source);
- }
+ g_free (priv->fragment_source);
CLUTTER_NOTE (SHADER, "setting fragment shader (GLSL:%s, len:%"
G_GSSIZE_FORMAT ")",
if (clutter_shader_is_bound (shader))
clutter_shader_release (shader);
-
is_glsl = !g_str_has_prefix (data, "!!ARBvp");
- if (priv->vertex_source)
- {
- g_free (priv->vertex_source);
- }
+ g_free (priv->vertex_source);
CLUTTER_NOTE (SHADER, "setting vertex shader (GLSL:%s, len:%"
G_GSSIZE_FORMAT ")",
#include <stdlib.h>
#include <clutter/clutter.h>
-ClutterGravity gravities[] = {
+static const ClutterGravity gravities[] = {
CLUTTER_GRAVITY_NORTH_EAST,
CLUTTER_GRAVITY_NORTH,
CLUTTER_GRAVITY_NORTH_WEST,
CLUTTER_GRAVITY_NONE
};
-gint gindex = 0;
+static gint gindex = 0;
-void
+static void
on_timeline_completed (ClutterTimeline *cluttertimeline,
gpointer data)
{
clutter_group_add (CLUTTER_GROUP (stage), rect);
- timeline = clutter_timeline_new (20, 30);
+ timeline = clutter_timeline_new_for_duration (750);
alpha = clutter_alpha_new_full (timeline,
CLUTTER_ALPHA_RAMP,
NULL, NULL);
clutter_main();
+ g_object_unref (timeline);
+ g_object_unref (behave);
+
return EXIT_SUCCESS;
}