mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 03:22:04 +00:00
2007-11-14 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.[ch]: Rename clutter_actor_get_id() to clutter_actor_get_gid(). (clutter_actor_set_parent): Use GUINT_TO_POINTER(). * clutter/clutter-deprecated.h: Add a replacement warning for clutter_actor_get_id(). * clutter/clutter-texture.c (texture_upload_data): Use clutter_actor_get_gid(), and don't leak the filename string.
This commit is contained in:
parent
b0e169d73c
commit
4de1adb04a
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
||||
2007-11-14 Emmanuele Bassi <ebassi@openedhand.com>
|
||||
|
||||
* clutter/clutter-actor.[ch]: Rename clutter_actor_get_id() to
|
||||
clutter_actor_get_gid().
|
||||
|
||||
(clutter_actor_set_parent): Use GUINT_TO_POINTER().
|
||||
|
||||
* clutter/clutter-deprecated.h: Add a replacement warning for
|
||||
clutter_actor_get_id().
|
||||
|
||||
* clutter/clutter-texture.c (texture_upload_data): Use
|
||||
clutter_actor_get_gid(), and don't leak the filename string.
|
||||
|
||||
2007-11-14 Emmanuele Bassi <ebassi@openedhand.com>
|
||||
|
||||
* clutter/clutter-scriptable.[ch]: Rename ::set_name and ::get_name
|
||||
|
@ -745,7 +745,7 @@ clutter_actor_paint (ClutterActor *self)
|
||||
|| (context->pick_mode == CLUTTER_PICK_REACTIVE
|
||||
&& CLUTTER_ACTOR_IS_REACTIVE(self)))
|
||||
{
|
||||
id = clutter_actor_get_id (self);
|
||||
id = clutter_actor_get_gid (self);
|
||||
|
||||
cogl_get_bitmasks (&r, &g, &b, NULL);
|
||||
|
||||
@ -2376,15 +2376,17 @@ clutter_actor_get_name (ClutterActor *self)
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_actor_get_id:
|
||||
* clutter_actor_get_gid:
|
||||
* @self: A #ClutterActor
|
||||
*
|
||||
* Retrieves the unique id for @self.
|
||||
*
|
||||
* Return value: Globally unique value for object instance.
|
||||
*
|
||||
* Since: 0.6
|
||||
*/
|
||||
guint32
|
||||
clutter_actor_get_id (ClutterActor *self)
|
||||
clutter_actor_get_gid (ClutterActor *self)
|
||||
{
|
||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), 0);
|
||||
|
||||
@ -2817,7 +2819,7 @@ clutter_actor_set_parent (ClutterActor *self,
|
||||
}
|
||||
|
||||
g_hash_table_insert (clutter_context->actor_hash,
|
||||
(gpointer)clutter_actor_get_id(self),
|
||||
GUINT_TO_POINTER (clutter_actor_get_gid (self)),
|
||||
(gpointer)self);
|
||||
|
||||
g_object_ref_sink (self);
|
||||
@ -2888,7 +2890,7 @@ clutter_actor_unparent (ClutterActor *self)
|
||||
g_signal_emit (self, actor_signals[PARENT_SET], 0, old_parent);
|
||||
|
||||
g_hash_table_remove (clutter_context->actor_hash,
|
||||
GUINT_TO_POINTER (clutter_actor_get_id(self)));
|
||||
GUINT_TO_POINTER (clutter_actor_get_gid (self)));
|
||||
|
||||
g_object_unref (self);
|
||||
}
|
||||
|
@ -303,7 +303,7 @@ guint8 clutter_actor_get_opacity (ClutterActor *sel
|
||||
void clutter_actor_set_name (ClutterActor *self,
|
||||
const gchar *name);
|
||||
G_CONST_RETURN gchar *clutter_actor_get_name (ClutterActor *self);
|
||||
guint32 clutter_actor_get_id (ClutterActor *self);
|
||||
guint32 clutter_actor_get_gid (ClutterActor *self);
|
||||
void clutter_actor_set_clip (ClutterActor *self,
|
||||
gint xoff,
|
||||
gint yoff,
|
||||
|
@ -16,5 +16,6 @@
|
||||
#define clutter_behaviour_ellipse_get_angle_begin clutter_behaviour_ellipse_get_angle_begin_REPLACED_BY_clutter_behaviour_get_angle_start
|
||||
#define clutter_behaviour_ellipse_get_angle_beginx clutter_behaviour_ellipse_get_angle_beginx_REPLACED_BY_clutter_behaviour_get_angle_startx
|
||||
#define clutter_behaviour_bspline_append clutter_behaviour_bspline_append_REPLACED_BY_clutter_behaviour_bspline_append_knots
|
||||
#define clutter_actor_get_id clutter_actor_get_id_REPLACED_BY_clutter_actor_get_gid
|
||||
|
||||
#endif /* CLUTTER_DEPRECATED_H */
|
||||
|
@ -548,11 +548,15 @@ texture_upload_data (ClutterTexture *texture,
|
||||
{
|
||||
gchar *filename;
|
||||
|
||||
filename = g_strdup_printf("/tmp/%i-%i-%i.png",
|
||||
clutter_actor_get_id(CLUTTER_ACTOR(texture)),
|
||||
x, y);
|
||||
printf("saving %s\n", filename);
|
||||
filename =
|
||||
g_strdup_printf("/tmp/%i-%i-%i.png",
|
||||
clutter_actor_get_gid (CLUTTER_ACTOR (texture)),
|
||||
x, y);
|
||||
|
||||
printf ("saving %s\n", filename);
|
||||
|
||||
gdk_pixbuf_save (pixtmp, filename , "png", NULL, NULL);
|
||||
g_free (filename);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user