gir-repository r142 - in trunk: . gir
- From: jobi svn gnome org
- To: svn-commits-list gnome org
- Subject: gir-repository r142 - in trunk: . gir
- Date: Mon, 20 Oct 2008 18:32:42 +0000 (UTC)
Author: jobi
Date: Mon Oct 20 18:32:42 2008
New Revision: 142
URL: http://svn.gnome.org/viewvc/gir-repository?rev=142&view=rev
Log:
2008-10-20 Johan Bilien <jobi via ecp fr>
* gir/ClutterAdditions.xml: removed
* gir/Clutter-custom.[ch]: removed custom prefix
* gir/Makefile.am: scan the additions header rather than use
--inject
Modified:
trunk/ChangeLog
trunk/gir/Clutter-custom.c
trunk/gir/Clutter-custom.h
trunk/gir/Makefile.am
Modified: trunk/gir/Clutter-custom.c
==============================================================================
--- trunk/gir/Clutter-custom.c (original)
+++ trunk/gir/Clutter-custom.c Mon Oct 20 18:32:42 2008
@@ -6,13 +6,20 @@
#include "Clutter-custom.h"
ClutterColor*
-girepo_clutter_color_new (void)
+clutter_color_new (void)
{
return g_slice_new0(ClutterColor);
}
+/**
+ * clutter_color_get_components:
+ * @color: A #ClutterColor
+ *
+ * Return Value: (element-type int) (transfer container): A list
+ * with the color components. Must be freed with g_list_free.
+ */
GList *
-girepo_clutter_color_get_components(ClutterColor *color)
+clutter_color_get_components(ClutterColor *color)
{
GList *list;
@@ -25,9 +32,14 @@
return list;
}
+/**
+ * clutter_color_set_components:
+ * @color: A #ClutterColor
+ * @components: (element-type int) (transfer none): A list of compoents
+ */
void
-girepo_clutter_color_set_components(ClutterColor *color,
- GList *components)
+clutter_color_set_components(ClutterColor *color,
+ GList *components)
{
g_return_if_fail(g_list_length(components) == 4);
@@ -40,9 +52,14 @@
color->alpha = GPOINTER_TO_INT(components->data);
}
+/**
+ * clutter_texture_set_from_pixbuf:
+ * @texture: A #ClutterTexture
+ * @pixbuf: (transfer none): A #GdkPixbuf
+ */
gboolean
-girepo_clutter_texture_set_from_pixbuf (ClutterTexture *texture,
- GdkPixbuf *pixbuf)
+clutter_texture_set_from_pixbuf (ClutterTexture *texture,
+ GdkPixbuf *pixbuf)
{
return clutter_texture_set_from_rgb_data (texture,
gdk_pixbuf_get_pixels (pixbuf),
@@ -56,62 +73,62 @@
}
ClutterGeometry *
-girepo_clutter_geometry_new(void)
+clutter_geometry_new(void)
{
return g_slice_new0(ClutterGeometry);
}
gint
-girepo_clutter_geometry_get_x(ClutterGeometry *geometry)
+clutter_geometry_get_x(ClutterGeometry *geometry)
{
return geometry->x;
}
gint
-girepo_clutter_geometry_get_y(ClutterGeometry *geometry)
+clutter_geometry_get_y(ClutterGeometry *geometry)
{
return geometry->y;
}
guint
-girepo_clutter_geometry_get_width(ClutterGeometry *geometry)
+clutter_geometry_get_width(ClutterGeometry *geometry)
{
return geometry->width;
}
guint
-girepo_clutter_geometry_get_height(ClutterGeometry *geometry)
+clutter_geometry_get_height(ClutterGeometry *geometry)
{
return geometry->height;
}
ClutterActorBox *
-girepo_clutter_actor_box_new(void)
+clutter_actor_box_new(void)
{
return g_slice_new0(ClutterActorBox);
}
/* return is ClutterUnit, but gint32 in gidl, so we want a warning here if that's ever wrong */
gint32
-girepo_clutter_actor_box_get_x1(ClutterActorBox *actor_box)
+clutter_actor_box_get_x1(ClutterActorBox *actor_box)
{
return actor_box->x1;
}
gint32
-girepo_clutter_actor_box_get_y1(ClutterActorBox *actor_box)
+clutter_actor_box_get_y1(ClutterActorBox *actor_box)
{
return actor_box->y1;
}
gint32
-girepo_clutter_actor_box_get_x2(ClutterActorBox *actor_box)
+clutter_actor_box_get_x2(ClutterActorBox *actor_box)
{
return actor_box->x2;
}
gint32
-girepo_clutter_actor_box_get_y2(ClutterActorBox *actor_box)
+clutter_actor_box_get_y2(ClutterActorBox *actor_box)
{
return actor_box->y2;
}
@@ -120,19 +137,19 @@
* if that ever breaks
*/
gint
-girepo_clutter_units_to_device(gint32 units)
+clutter_units_to_device(gint32 units)
{
return CLUTTER_UNITS_TO_DEVICE(units);
}
gint32
-girepo_clutter_device_to_units(gint device)
+clutter_device_to_units(gint device)
{
return CLUTTER_UNITS_FROM_DEVICE(device);
}
gint
-girepo_clutter_event_get_x(ClutterEvent *event)
+clutter_event_get_x(ClutterEvent *event)
{
int x;
@@ -142,7 +159,7 @@
}
gint
-girepo_clutter_event_get_y(ClutterEvent *event)
+clutter_event_get_y(ClutterEvent *event)
{
int y;
@@ -152,16 +169,16 @@
}
ClutterVertex*
-girepo_clutter_vertex_new(void)
+clutter_vertex_new(void)
{
return g_slice_new0(ClutterVertex);
}
void
-girepo_clutter_vertex_set_values(ClutterVertex *vertex,
- int x,
- int y,
- int z)
+clutter_vertex_set_values(ClutterVertex *vertex,
+ int x,
+ int y,
+ int z)
{
vertex->x = x;
vertex->y = y;
Modified: trunk/gir/Clutter-custom.h
==============================================================================
--- trunk/gir/Clutter-custom.h (original)
+++ trunk/gir/Clutter-custom.h Mon Oct 20 18:32:42 2008
@@ -10,33 +10,33 @@
G_BEGIN_DECLS
-ClutterColor * girepo_clutter_color_new (void) G_GNUC_MALLOC;
+ClutterColor * clutter_color_new (void) G_GNUC_MALLOC;
-void girepo_clutter_color_set_components (ClutterColor *color,
- GList *components);
-GList * girepo_clutter_color_get_components (ClutterColor *color);
-
-gboolean girepo_clutter_texture_set_from_pixbuf (ClutterTexture *texture,
- GdkPixbuf *pixbuf);
-ClutterGeometry *girepo_clutter_geometry_new (void);
-gint girepo_clutter_geometry_get_x (ClutterGeometry *geometry);
-gint girepo_clutter_geometry_get_y (ClutterGeometry *geometry);
-guint girepo_clutter_geometry_get_width (ClutterGeometry *geometry);
-guint girepo_clutter_geometry_get_height (ClutterGeometry *geometry);
-ClutterActorBox *girepo_clutter_actor_box_new (void);
-gint32 girepo_clutter_actor_box_get_x1 (ClutterActorBox *actor_box);
-gint32 girepo_clutter_actor_box_get_y1 (ClutterActorBox *actor_box);
-gint32 girepo_clutter_actor_box_get_x2 (ClutterActorBox *actor_box);
-gint32 girepo_clutter_actor_box_get_y2 (ClutterActorBox *actor_box);
-gint girepo_clutter_units_to_device (gint32 units);
-gint32 girepo_clutter_device_to_units (gint device);
-gint girepo_clutter_event_get_x (ClutterEvent *event);
-gint girepo_clutter_event_get_y (ClutterEvent *event);
-ClutterVertex* girepo_clutter_vertex_new (void) G_GNUC_MALLOC;
-void girepo_clutter_vertex_set_values (ClutterVertex *vertex,
- int x,
- int y,
- int z);
+void clutter_color_set_components (ClutterColor *color,
+ GList *components);
+GList * clutter_color_get_components (ClutterColor *color);
+
+gboolean clutter_texture_set_from_pixbuf (ClutterTexture *texture,
+ GdkPixbuf *pixbuf);
+ClutterGeometry *clutter_geometry_new (void);
+gint clutter_geometry_get_x (ClutterGeometry *geometry);
+gint clutter_geometry_get_y (ClutterGeometry *geometry);
+guint clutter_geometry_get_width (ClutterGeometry *geometry);
+guint clutter_geometry_get_height (ClutterGeometry *geometry);
+ClutterActorBox *clutter_actor_box_new (void);
+gint32 clutter_actor_box_get_x1 (ClutterActorBox *actor_box);
+gint32 clutter_actor_box_get_y1 (ClutterActorBox *actor_box);
+gint32 clutter_actor_box_get_x2 (ClutterActorBox *actor_box);
+gint32 clutter_actor_box_get_y2 (ClutterActorBox *actor_box);
+gint clutter_units_to_device (gint32 units);
+gint32 clutter_device_to_units (gint device);
+gint clutter_event_get_x (ClutterEvent *event);
+gint clutter_event_get_y (ClutterEvent *event);
+ClutterVertex* clutter_vertex_new (void) G_GNUC_MALLOC;
+void clutter_vertex_set_values (ClutterVertex *vertex,
+ int x,
+ int y,
+ int z);
G_END_DECLS
Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am (original)
+++ trunk/gir/Makefile.am Mon Oct 20 18:32:42 2008
@@ -398,7 +398,7 @@
-I$(CLUTTER_INCLUDEDIR) \
$(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/json/*.h
-Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterAdditions.xml ClutterJson-0.8.gir GdkPixbuf-2.0.gir Pango-1.0.gir PangoCairo-1.0.gir $(G_IR_SCANNER) clutter-0.8.c
+Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterJson-0.8.gir GdkPixbuf-2.0.gir Pango-1.0.gir PangoCairo-1.0.gir $(G_IR_SCANNER) clutter-0.8.c
$(G_IR_SCANNER) -v --namespace Clutter --nsversion=0.8 \
--add-include-path=$(srcdir) --add-include-path=. \
--include=GL-1.0 \
@@ -416,9 +416,10 @@
--output $@ \
-I$(CLUTTER_INCLUDEDIR) \
$(srcdir)/clutter-0.8.c \
+ $(srcdir)/Clutter-custom.c \
+ $(srcdir)/Clutter-custom.h \
$(CLUTTER_INCLUDEDIR)/clutter-0.8/cogl/*.h \
$(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/*.h
- $(G_IR_SCANNER) --inject $@ ClutterAdditions.xml $@
BUILT_GIRSOURCES += Clutter-0.8.gir ClutterJson-0.8.gir
XPATH_TESTS += Clutter-0.8.xpath
endif BUILD_CLUTTER
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
