From f8de77ac92c28c7a8ea11a73421073dd7843f4fb Mon Sep 17 00:00:00 2001 From: Tomas Frydrych Date: Tue, 16 Oct 2007 08:34:16 +0000 Subject: [PATCH] 2007-10-16 Tomas Frydrych * clutter.symbols: Added a bunch of missing symbols. * clutter/clutter-script.c: * json/json-node.c: Use g_slice_new0 instead of g_slice_new to avoid passing garbage to functions. * tests/test-threads.c: Replaced non-portable sleep() with g_usleep(). --- ChangeLog | 12 ++++++++++++ clutter.symbols | 4 +++- clutter/clutter-script.c | 12 ++++++------ clutter/json/json-node.c | 2 +- tests/test-threads.c | 5 ++--- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 464a1a464..654e84d6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-10-16 Tomas Frydrych + + * clutter.symbols: + Added a bunch of missing symbols. + + * clutter/clutter-script.c: + * json/json-node.c: + Use g_slice_new0 instead of g_slice_new to avoid passing garbage to functions. + + * tests/test-threads.c: + Replaced non-portable sleep() with g_usleep(). + 2007-10-15 Tomas Frydrych * clutter/cogl/gl/cogl-defines.h: diff --git a/clutter.symbols b/clutter.symbols index 969ac4a6d..857a29add 100644 --- a/clutter.symbols +++ b/clutter.symbols @@ -401,7 +401,7 @@ clutter_stage_set_title clutter_stage_get_title clutter_stage_set_user_resizable clutter_stage_get_user_resizable -clutter_stage_get_key_focus +clutter_stage_set_key_focus clutter_texture_error_quark clutter_texture_get_type clutter_texture_new @@ -485,6 +485,8 @@ clutter_score_is_playing clutter_score_start clutter_score_stop clutter_score_remove_all +clutter_score_add +clutter_score_append clutter_actor_flags_get_type clutter_pack_type_get_type clutter_modifier_type_get_type diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c index 56cccb233..1a912d0ec 100644 --- a/clutter/clutter-script.c +++ b/clutter/clutter-script.c @@ -330,7 +330,7 @@ construct_timeline (ClutterScript *script, if (JSON_NODE_TYPE (node) == JSON_NODE_VALUE) { - PropertyInfo *pinfo = g_slice_new (PropertyInfo); + PropertyInfo *pinfo = g_slice_new0 (PropertyInfo); GValue value = { 0, }; pinfo->property_name = g_strdup (name); @@ -416,7 +416,7 @@ parse_member_to_property (ClutterScript *script, switch (JSON_NODE_TYPE (node)) { case JSON_NODE_VALUE: - retval = g_slice_new (PropertyInfo); + retval = g_slice_new0 (PropertyInfo); retval->property_name = g_strdup (name); json_node_get_value (node, &value); @@ -435,7 +435,7 @@ parse_member_to_property (ClutterScript *script, JsonNode *val; gboolean unref_timeline = FALSE; - retval = g_slice_new (PropertyInfo); + retval = g_slice_new0 (PropertyInfo); retval->property_name = g_strdup (name); alpha = clutter_alpha_new (); @@ -509,7 +509,7 @@ parse_member_to_property (ClutterScript *script, } } - retval = g_slice_new (PropertyInfo); + retval = g_slice_new0 (PropertyInfo); retval->property_name = g_strdup (name); g_value_init (&retval->value, CLUTTER_TYPE_MARGIN); g_value_set_boxed (&retval->value, &margin); @@ -549,7 +549,7 @@ parse_member_to_property (ClutterScript *script, } } - retval = g_slice_new (PropertyInfo); + retval = g_slice_new0 (PropertyInfo); retval->property_name = g_strdup (name); g_value_init (&retval->value, CLUTTER_TYPE_PADDING); g_value_set_boxed (&retval->value, &padding); @@ -574,7 +574,7 @@ parse_member_to_property (ClutterScript *script, } } - retval = g_slice_new (PropertyInfo); + retval = g_slice_new0 (PropertyInfo); retval->property_name = g_strdup (name); g_value_init (&retval->value, CLUTTER_TYPE_GEOMETRY); g_value_set_boxed (&retval->value, &geom); diff --git a/clutter/json/json-node.c b/clutter/json/json-node.c index 263f129c6..61bb64470 100644 --- a/clutter/json/json-node.c +++ b/clutter/json/json-node.c @@ -59,7 +59,7 @@ json_node_new (JsonNodeType type) g_return_val_if_fail (type >= JSON_NODE_OBJECT && type <= JSON_NODE_NULL, NULL); - data = g_slice_new (JsonNode); + data = g_slice_new0 (JsonNode); data->type = type; return data; diff --git a/tests/test-threads.c b/tests/test-threads.c index 518a0f654..9658d08aa 100644 --- a/tests/test-threads.c +++ b/tests/test-threads.c @@ -1,6 +1,5 @@ #include #include -#include /* sleep() */ #include typedef struct @@ -84,9 +83,9 @@ do_something_very_slow (void) for (i = 0; i < 100; i++) { /* sleep for a while */ - sleep(rand() / (RAND_MAX / 3) + 1); + g_usleep((rand() / (RAND_MAX / 3) + 1) * 1000000); - if ((i % 10) == 0) + if ((i % 10) == 0) { TestUpdate *update;