rpms/gcompris/devel gcompris-8.2.2-py25.patch, NONE, 1.1 gcompris.spec, 1.19, 1.20
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Dec 22 09:25:35 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8323
Modified Files:
gcompris.spec
Added Files:
gcompris-8.2.2-py25.patch
Log Message:
* Fri Dec 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.2.2-2
- Update src/boards/canvas.c to canvas.c from latest gnome-python2 to
fix build with python 2.5
gcompris-8.2.2-py25.patch:
--- NEW FILE gcompris-8.2.2-py25.patch ---
--- gcompris-8.2.2/src/boards/canvas.c.py25 2006-10-03 00:46:17.000000000 +0200
+++ gcompris-8.2.2/src/boards/canvas.c 2006-12-22 09:29:38.000000000 +0100
@@ -1,9 +1,21 @@
/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
+#define PY_SSIZE_T_CLEAN
#include <Python.h>
+
+#if PY_VERSION_HEX < 0x02050000
+typedef int Py_ssize_t;
+#define PY_SSIZE_T_MAX INT_MAX
+#define PY_SSIZE_T_MIN INT_MIN
+typedef inquiry lenfunc;
+typedef intargfunc ssizeargfunc;
+typedef intobjargproc ssizeobjargproc;
+#endif
+
+
#line 4 "canvas.override"
#include <Python.h>
@@ -63,7 +75,7 @@
#endif
-#line 67 "canvas.c"
+#line 79 "canvas.c"
/* ---------- types from other modules ---------- */
@@ -76,22 +88,25 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyGnomeCanvasPathDef_Type;
-PyTypeObject PyGnomeCanvas_Type;
-PyTypeObject PyGnomeCanvasItem_Type;
-PyTypeObject PyGnomeCanvasGroup_Type;
-PyTypeObject PyGnomeCanvasClipgroup_Type;
-PyTypeObject PyGnomeCanvasLine_Type;
-PyTypeObject PyGnomeCanvasPixbuf_Type;
-PyTypeObject PyGnomeCanvasRichText_Type;
-PyTypeObject PyGnomeCanvasShape_Type;
-PyTypeObject PyGnomeCanvasRE_Type;
-PyTypeObject PyGnomeCanvasRect_Type;
-PyTypeObject PyGnomeCanvasEllipse_Type;
-PyTypeObject PyGnomeCanvasPolygon_Type;
-PyTypeObject PyGnomeCanvasBpath_Type;
-PyTypeObject PyGnomeCanvasText_Type;
-PyTypeObject PyGnomeCanvasWidget_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasPathDef_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvas_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasItem_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasGroup_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasClipgroup_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasLine_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasPixbuf_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasRichText_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasShape_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasRE_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasRect_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasEllipse_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasPolygon_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasBpath_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasText_Type;
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasWidget_Type;
+
+#line 109 "canvas.c"
+
/* ----------- GnomeCanvasPathDef ----------- */
@@ -106,7 +121,7 @@
return -1;
}
-PyTypeObject PyGnomeCanvasPathDef_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasPathDef_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasPathDef", /* tp_name */
@@ -136,9 +151,9 @@
0, /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -178,7 +193,7 @@
pygobject_register_wrapper((PyObject *)self);
return 0;
}
-#line 182 "canvas.c"
+#line 197 "canvas.c"
static PyObject *
@@ -186,7 +201,9 @@
{
GnomeCanvasGroup *ret;
+
ret = gnome_canvas_root(GNOME_CANVAS(self->obj));
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -197,9 +214,11 @@
static char *kwlist[] = { "n", NULL };
double n;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "d:GnomeCanvas.set_pixels_per_unit", kwlist, &n))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"d:GnomeCanvas.set_pixels_per_unit", kwlist, &n))
return NULL;
+
gnome_canvas_set_pixels_per_unit(GNOME_CANVAS(self->obj), n);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -210,9 +229,11 @@
static char *kwlist[] = { "x1", "y1", "x2", "y2", NULL };
double x1, y1, x2, y2;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "dddd:GnomeCanvas.set_scroll_region", kwlist, &x1, &y1, &x2, &y2))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"dddd:GnomeCanvas.set_scroll_region", kwlist, &x1, &y1, &x2, &y2))
return NULL;
+
gnome_canvas_set_scroll_region(GNOME_CANVAS(self->obj), x1, y1, x2, y2);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -228,7 +249,7 @@
return Py_BuildValue("(dddd)", x1, y1, x2, y2);
}
-#line 232 "canvas.c"
+#line 253 "canvas.c"
static PyObject *
@@ -236,7 +257,9 @@
{
int ret;
+
ret = gnome_canvas_get_center_scroll_region(GNOME_CANVAS(self->obj));
+
return PyBool_FromLong(ret);
}
@@ -247,9 +270,11 @@
static char *kwlist[] = { "center_scroll_region", NULL };
int center_scroll_region;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:GnomeCanvas.set_center_scroll_region", kwlist, ¢er_scroll_region))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GnomeCanvas.set_center_scroll_region", kwlist, ¢er_scroll_region))
return NULL;
+
gnome_canvas_set_center_scroll_region(GNOME_CANVAS(self->obj), center_scroll_region);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -260,9 +285,11 @@
static char *kwlist[] = { "cx", "cy", NULL };
int cx, cy;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:GnomeCanvas.scroll_to", kwlist, &cx, &cy))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ii:GnomeCanvas.scroll_to", kwlist, &cx, &cy))
return NULL;
+
gnome_canvas_scroll_to(GNOME_CANVAS(self->obj), cx, cy);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -277,13 +304,15 @@
return Py_BuildValue("(ii)", cx, cy);
}
-#line 281 "canvas.c"
+#line 308 "canvas.c"
static PyObject *
_wrap_gnome_canvas_update_now(PyGObject *self)
{
+
gnome_canvas_update_now(GNOME_CANVAS(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -295,9 +324,11 @@
double x, y;
GnomeCanvasItem *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "dd:GnomeCanvas.get_item_at", kwlist, &x, &y))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"dd:GnomeCanvas.get_item_at", kwlist, &x, &y))
return NULL;
+
ret = gnome_canvas_get_item_at(GNOME_CANVAS(self->obj), x, y);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -317,7 +348,7 @@
return gnomecanvasaffine_from_value(affine);
}
-#line 321 "canvas.c"
+#line 352 "canvas.c"
#line 286 "canvas.override"
@@ -335,7 +366,7 @@
return Py_BuildValue("(ii)", cx, cy);
}
-#line 339 "canvas.c"
+#line 370 "canvas.c"
#line 302 "canvas.override"
@@ -353,7 +384,7 @@
return Py_BuildValue("(dd)", cx, cy);
}
-#line 357 "canvas.c"
+#line 388 "canvas.c"
#line 318 "canvas.override"
@@ -371,7 +402,7 @@
return Py_BuildValue("(dd)", wx, wy);
}
-#line 375 "canvas.c"
+#line 406 "canvas.c"
#line 334 "canvas.override"
@@ -391,7 +422,7 @@
return Py_BuildValue("(dd)", worldx, worldy);
}
-#line 395 "canvas.c"
+#line 426 "canvas.c"
#line 352 "canvas.override"
@@ -411,7 +442,7 @@
return Py_BuildValue("(dd)", winx, winy);
}
-#line 415 "canvas.c"
+#line 446 "canvas.c"
static PyObject *
@@ -423,7 +454,7 @@
int ret;
GdkColor *color = NULL;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO:GnomeCanvas.get_color", kwlist, &spec, &py_color))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sO:GnomeCanvas.get_color", kwlist, &spec, &py_color))
return NULL;
if (pyg_boxed_check(py_color, GDK_TYPE_COLOR))
color = pyg_boxed_get(py_color, GdkColor);
@@ -431,7 +462,9 @@
PyErr_SetString(PyExc_TypeError, "color should be a GdkColor");
return NULL;
}
+
ret = gnome_canvas_get_color(GNOME_CANVAS(self->obj), spec, color);
+
return PyInt_FromLong(ret);
}
@@ -439,13 +472,27 @@
_wrap_gnome_canvas_get_color_pixel(PyGObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "rgba", NULL };
+ PyObject *py_rgba = NULL;
gulong ret;
- guint rgba;
+ guint rgba = 0;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "I:GnomeCanvas.get_color_pixel", kwlist, &rgba))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:GnomeCanvas.get_color_pixel", kwlist, &py_rgba))
return NULL;
+ if (py_rgba) {
+ if (PyLong_Check(py_rgba))
+ rgba = PyLong_AsUnsignedLong(py_rgba);
+ else if (PyInt_Check(py_rgba))
+ rgba = PyInt_AsLong(py_rgba);
+ else
+ PyErr_SetString(PyExc_TypeError, "Parameter 'rgba' must be an int or a long");
+ if (PyErr_Occurred())
+ return NULL;
+ }
+
ret = gnome_canvas_get_color_pixel(GNOME_CANVAS(self->obj), rgba);
+
return PyLong_FromUnsignedLong(ret);
+
}
static PyObject *
@@ -455,11 +502,13 @@
PyObject *py_dither = NULL;
GdkRgbDither dither;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:GnomeCanvas.set_dither", kwlist, &py_dither))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:GnomeCanvas.set_dither", kwlist, &py_dither))
return NULL;
- if (pyg_enum_get_value(GDK_TYPE_RGB_DITHER, py_dither, (gint *)&dither))
+ if (pyg_enum_get_value(GDK_TYPE_RGB_DITHER, py_dither, (gpointer)&dither))
return NULL;
+
gnome_canvas_set_dither(GNOME_CANVAS(self->obj), dither);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -469,35 +518,57 @@
{
gint ret;
+
ret = gnome_canvas_get_dither(GNOME_CANVAS(self->obj));
+
return pyg_enum_from_gtype(GDK_TYPE_RGB_DITHER, ret);
}
-static PyMethodDef _PyGnomeCanvas_methods[] = {
- { "root", (PyCFunction)_wrap_gnome_canvas_root, METH_NOARGS },
- { "set_pixels_per_unit", (PyCFunction)_wrap_gnome_canvas_set_pixels_per_unit, METH_VARARGS|METH_KEYWORDS },
- { "set_scroll_region", (PyCFunction)_wrap_gnome_canvas_set_scroll_region, METH_VARARGS|METH_KEYWORDS },
- { "get_scroll_region", (PyCFunction)_wrap_gnome_canvas_get_scroll_region, METH_NOARGS },
- { "get_center_scroll_region", (PyCFunction)_wrap_gnome_canvas_get_center_scroll_region, METH_NOARGS },
- { "set_center_scroll_region", (PyCFunction)_wrap_gnome_canvas_set_center_scroll_region, METH_VARARGS|METH_KEYWORDS },
- { "scroll_to", (PyCFunction)_wrap_gnome_canvas_scroll_to, METH_VARARGS|METH_KEYWORDS },
- { "get_scroll_offsets", (PyCFunction)_wrap_gnome_canvas_get_scroll_offsets, METH_NOARGS },
- { "update_now", (PyCFunction)_wrap_gnome_canvas_update_now, METH_NOARGS },
- { "get_item_at", (PyCFunction)_wrap_gnome_canvas_get_item_at, METH_VARARGS|METH_KEYWORDS },
- { "w2c_affine", (PyCFunction)_wrap_gnome_canvas_w2c_affine, METH_VARARGS },
- { "w2c", (PyCFunction)_wrap_gnome_canvas_w2c, METH_VARARGS|METH_KEYWORDS },
- { "w2c_d", (PyCFunction)_wrap_gnome_canvas_w2c_d, METH_VARARGS|METH_KEYWORDS },
- { "c2w", (PyCFunction)_wrap_gnome_canvas_c2w, METH_VARARGS|METH_KEYWORDS },
- { "window_to_world", (PyCFunction)_wrap_gnome_canvas_window_to_world, METH_VARARGS|METH_KEYWORDS },
- { "world_to_window", (PyCFunction)_wrap_gnome_canvas_world_to_window, METH_VARARGS|METH_KEYWORDS },
- { "get_color", (PyCFunction)_wrap_gnome_canvas_get_color, METH_VARARGS|METH_KEYWORDS },
- { "get_color_pixel", (PyCFunction)_wrap_gnome_canvas_get_color_pixel, METH_VARARGS|METH_KEYWORDS },
- { "set_dither", (PyCFunction)_wrap_gnome_canvas_set_dither, METH_VARARGS|METH_KEYWORDS },
- { "get_dither", (PyCFunction)_wrap_gnome_canvas_get_dither, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyGnomeCanvas_methods[] = {
+ { "root", (PyCFunction)_wrap_gnome_canvas_root, METH_NOARGS,
+ NULL },
+ { "set_pixels_per_unit", (PyCFunction)_wrap_gnome_canvas_set_pixels_per_unit, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_scroll_region", (PyCFunction)_wrap_gnome_canvas_set_scroll_region, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_scroll_region", (PyCFunction)_wrap_gnome_canvas_get_scroll_region, METH_NOARGS,
+ NULL },
+ { "get_center_scroll_region", (PyCFunction)_wrap_gnome_canvas_get_center_scroll_region, METH_NOARGS,
+ NULL },
+ { "set_center_scroll_region", (PyCFunction)_wrap_gnome_canvas_set_center_scroll_region, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "scroll_to", (PyCFunction)_wrap_gnome_canvas_scroll_to, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_scroll_offsets", (PyCFunction)_wrap_gnome_canvas_get_scroll_offsets, METH_NOARGS,
+ NULL },
+ { "update_now", (PyCFunction)_wrap_gnome_canvas_update_now, METH_NOARGS,
+ NULL },
+ { "get_item_at", (PyCFunction)_wrap_gnome_canvas_get_item_at, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "w2c_affine", (PyCFunction)_wrap_gnome_canvas_w2c_affine, METH_VARARGS,
+ NULL },
+ { "w2c", (PyCFunction)_wrap_gnome_canvas_w2c, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "w2c_d", (PyCFunction)_wrap_gnome_canvas_w2c_d, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "c2w", (PyCFunction)_wrap_gnome_canvas_c2w, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "window_to_world", (PyCFunction)_wrap_gnome_canvas_window_to_world, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "world_to_window", (PyCFunction)_wrap_gnome_canvas_world_to_window, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_color", (PyCFunction)_wrap_gnome_canvas_get_color, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_color_pixel", (PyCFunction)_wrap_gnome_canvas_get_color_pixel, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_dither", (PyCFunction)_wrap_gnome_canvas_set_dither, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_dither", (PyCFunction)_wrap_gnome_canvas_get_dither, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyGnomeCanvas_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvas_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.Canvas", /* tp_name */
@@ -527,9 +598,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- _PyGnomeCanvas_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)_PyGnomeCanvas_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -554,7 +625,7 @@
GType type;
GnomeCanvasItem *item;
GObjectClass *class;
- gint pos = 0;
+ Py_ssize_t pos = 0;
PyObject *value;
PyObject *key;
@@ -600,7 +671,7 @@
Py_INCREF(Py_None);
return Py_None;
}
-#line 604 "canvas.c"
+#line 675 "canvas.c"
static PyObject *
@@ -609,9 +680,11 @@
static char *kwlist[] = { "dx", "dy", NULL };
double dx, dy;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "dd:GnomeCanvasItem.move", kwlist, &dx, &dy))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"dd:GnomeCanvasItem.move", kwlist, &dx, &dy))
return NULL;
+
gnome_canvas_item_move(GNOME_CANVAS_ITEM(self->obj), dx, dy);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -634,7 +707,7 @@
Py_INCREF(Py_None);
return Py_None;
}
-#line 638 "canvas.c"
+#line 711 "canvas.c"
#line 370 "canvas.override"
@@ -655,7 +728,7 @@
Py_INCREF(Py_None);
return Py_None;
}
-#line 659 "canvas.c"
+#line 732 "canvas.c"
static PyObject *
@@ -664,9 +737,11 @@
static char *kwlist[] = { "positions", NULL };
int positions;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:GnomeCanvasItem.raise", kwlist, &positions))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GnomeCanvasItem.raise", kwlist, &positions))
return NULL;
+
gnome_canvas_item_raise(GNOME_CANVAS_ITEM(self->obj), positions);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -677,9 +752,11 @@
static char *kwlist[] = { "positions", NULL };
int positions;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:GnomeCanvasItem.lower", kwlist, &positions))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GnomeCanvasItem.lower", kwlist, &positions))
return NULL;
+
gnome_canvas_item_lower(GNOME_CANVAS_ITEM(self->obj), positions);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -687,7 +764,9 @@
static PyObject *
_wrap_gnome_canvas_item_raise_to_top(PyGObject *self)
{
+
gnome_canvas_item_raise_to_top(GNOME_CANVAS_ITEM(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -695,7 +774,9 @@
static PyObject *
_wrap_gnome_canvas_item_lower_to_bottom(PyGObject *self)
{
+
gnome_canvas_item_lower_to_bottom(GNOME_CANVAS_ITEM(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -703,7 +784,9 @@
static PyObject *
_wrap_gnome_canvas_item_show(PyGObject *self)
{
+
gnome_canvas_item_show(GNOME_CANVAS_ITEM(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -711,7 +794,9 @@
static PyObject *
_wrap_gnome_canvas_item_hide(PyGObject *self)
{
+
gnome_canvas_item_hide(GNOME_CANVAS_ITEM(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -730,7 +815,7 @@
return Py_BuildValue("(dd)", x, y);
}
-#line 734 "canvas.c"
+#line 819 "canvas.c"
#line 210 "canvas.override"
@@ -747,7 +832,7 @@
return Py_BuildValue("(dd)", x, y);
}
-#line 751 "canvas.c"
+#line 836 "canvas.c"
#line 424 "canvas.override"
@@ -765,7 +850,7 @@
return gnomecanvasaffine_from_value(affine);
}
-#line 769 "canvas.c"
+#line 854 "canvas.c"
#line 408 "canvas.override"
@@ -783,7 +868,7 @@
return gnomecanvasaffine_from_value(affine);
}
-#line 787 "canvas.c"
+#line 872 "canvas.c"
static PyObject *
@@ -792,9 +877,11 @@
static char *kwlist[] = { "new_group", NULL };
PyGObject *new_group;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:GnomeCanvasItem.reparent", kwlist, &PyGnomeCanvasGroup_Type, &new_group))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:GnomeCanvasItem.reparent", kwlist, &PyGnomeCanvasGroup_Type, &new_group))
return NULL;
+
gnome_canvas_item_reparent(GNOME_CANVAS_ITEM(self->obj), GNOME_CANVAS_GROUP(new_group->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -838,13 +925,15 @@
return PyInt_FromLong(retval);
}
-#line 842 "canvas.c"
+#line 929 "canvas.c"
static PyObject *
_wrap_gnome_canvas_item_grab_focus(PyGObject *self)
{
+
gnome_canvas_item_grab_focus(GNOME_CANVAS_ITEM(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -860,32 +949,50 @@
return Py_BuildValue("(dddd)", x1, y1, x2, y2);
}
-#line 864 "canvas.c"
+#line 953 "canvas.c"
-static PyMethodDef _PyGnomeCanvasItem_methods[] = {
- { "set", (PyCFunction)_wrap_gnome_canvas_item_set, METH_VARARGS|METH_KEYWORDS },
- { "move", (PyCFunction)_wrap_gnome_canvas_item_move, METH_VARARGS|METH_KEYWORDS },
- { "affine_relative", (PyCFunction)_wrap_gnome_canvas_item_affine_relative, METH_VARARGS },
- { "affine_absolute", (PyCFunction)_wrap_gnome_canvas_item_affine_absolute, METH_VARARGS },
- { "raise_", (PyCFunction)_wrap_gnome_canvas_item_raise, METH_VARARGS|METH_KEYWORDS },
- { "lower", (PyCFunction)_wrap_gnome_canvas_item_lower, METH_VARARGS|METH_KEYWORDS },
- { "raise_to_top", (PyCFunction)_wrap_gnome_canvas_item_raise_to_top, METH_NOARGS },
- { "lower_to_bottom", (PyCFunction)_wrap_gnome_canvas_item_lower_to_bottom, METH_NOARGS },
- { "show", (PyCFunction)_wrap_gnome_canvas_item_show, METH_NOARGS },
- { "hide", (PyCFunction)_wrap_gnome_canvas_item_hide, METH_NOARGS },
- { "w2i", (PyCFunction)_wrap_gnome_canvas_item_w2i, METH_VARARGS|METH_KEYWORDS },
- { "i2w", (PyCFunction)_wrap_gnome_canvas_item_i2w, METH_VARARGS|METH_KEYWORDS },
- { "i2w_affine", (PyCFunction)_wrap_gnome_canvas_item_i2w_affine, METH_VARARGS },
- { "i2c_affine", (PyCFunction)_wrap_gnome_canvas_item_i2c_affine, METH_VARARGS },
- { "reparent", (PyCFunction)_wrap_gnome_canvas_item_reparent, METH_VARARGS|METH_KEYWORDS },
- { "grab", (PyCFunction)_wrap_gnome_canvas_item_grab, METH_VARARGS|METH_KEYWORDS },
- { "grab_focus", (PyCFunction)_wrap_gnome_canvas_item_grab_focus, METH_NOARGS },
- { "get_bounds", (PyCFunction)_wrap_gnome_canvas_item_get_bounds, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyGnomeCanvasItem_methods[] = {
+ { "set", (PyCFunction)_wrap_gnome_canvas_item_set, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "move", (PyCFunction)_wrap_gnome_canvas_item_move, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "affine_relative", (PyCFunction)_wrap_gnome_canvas_item_affine_relative, METH_VARARGS,
+ NULL },
+ { "affine_absolute", (PyCFunction)_wrap_gnome_canvas_item_affine_absolute, METH_VARARGS,
+ NULL },
+ { "raise_", (PyCFunction)_wrap_gnome_canvas_item_raise, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "lower", (PyCFunction)_wrap_gnome_canvas_item_lower, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "raise_to_top", (PyCFunction)_wrap_gnome_canvas_item_raise_to_top, METH_NOARGS,
+ NULL },
+ { "lower_to_bottom", (PyCFunction)_wrap_gnome_canvas_item_lower_to_bottom, METH_NOARGS,
+ NULL },
+ { "show", (PyCFunction)_wrap_gnome_canvas_item_show, METH_NOARGS,
+ NULL },
+ { "hide", (PyCFunction)_wrap_gnome_canvas_item_hide, METH_NOARGS,
+ NULL },
+ { "w2i", (PyCFunction)_wrap_gnome_canvas_item_w2i, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "i2w", (PyCFunction)_wrap_gnome_canvas_item_i2w, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "i2w_affine", (PyCFunction)_wrap_gnome_canvas_item_i2w_affine, METH_VARARGS,
+ NULL },
+ { "i2c_affine", (PyCFunction)_wrap_gnome_canvas_item_i2c_affine, METH_VARARGS,
+ NULL },
+ { "reparent", (PyCFunction)_wrap_gnome_canvas_item_reparent, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "grab", (PyCFunction)_wrap_gnome_canvas_item_grab, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "grab_focus", (PyCFunction)_wrap_gnome_canvas_item_grab_focus, METH_NOARGS,
+ NULL },
+ { "get_bounds", (PyCFunction)_wrap_gnome_canvas_item_get_bounds, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyGnomeCanvasItem_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasItem_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasItem", /* tp_name */
@@ -915,9 +1022,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- _PyGnomeCanvasItem_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)_PyGnomeCanvasItem_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -944,7 +1051,7 @@
GType type;
GnomeCanvasItem *item;
GObjectClass *class;
- gint pos;
+ Py_ssize_t pos;
PyObject *value;
PyObject *key;
@@ -1000,12 +1107,13 @@
return pygobject_new ((GObject *)item);
}
-#line 1004 "canvas.c"
+#line 1111 "canvas.c"
-static PyMethodDef _PyGnomeCanvasGroup_methods[] = {
- { "add", (PyCFunction)_wrap_gnome_canvas_item_new, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyGnomeCanvasGroup_methods[] = {
+ { "add", (PyCFunction)_wrap_gnome_canvas_item_new, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
#line 456 "canvas.override"
@@ -1025,15 +1133,15 @@
return list;
}
-#line 1029 "canvas.c"
+#line 1137 "canvas.c"
-static PyGetSetDef gnome_canvas_group_getsets[] = {
+static const PyGetSetDef gnome_canvas_group_getsets[] = {
{ "item_list", (getter)_wrap_gnome_canvas_group__get_item_list, (setter)0 },
{ NULL, (getter)0, (setter)0 },
};
-PyTypeObject PyGnomeCanvasGroup_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasGroup_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasGroup", /* tp_name */
@@ -1063,9 +1171,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- _PyGnomeCanvasGroup_methods, /* tp_methods */
- 0, /* tp_members */
- gnome_canvas_group_getsets, /* tp_getset */
+ (struct PyMethodDef*)_PyGnomeCanvasGroup_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)gnome_canvas_group_getsets, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1082,7 +1190,7 @@
/* ----------- GnomeCanvasClipgroup ----------- */
-PyTypeObject PyGnomeCanvasClipgroup_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasClipgroup_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasClipgroup", /* tp_name */
@@ -1112,9 +1220,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1131,7 +1239,7 @@
/* ----------- GnomeCanvasLine ----------- */
-PyTypeObject PyGnomeCanvasLine_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasLine_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasLine", /* tp_name */
@@ -1161,9 +1269,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1180,7 +1288,7 @@
/* ----------- GnomeCanvasPixbuf ----------- */
-PyTypeObject PyGnomeCanvasPixbuf_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasPixbuf_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasPixbuf", /* tp_name */
@@ -1210,9 +1318,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1229,7 +1337,7 @@
/* ----------- GnomeCanvasRichText ----------- */
-PyTypeObject PyGnomeCanvasRichText_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasRichText_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasRichText", /* tp_name */
@@ -1259,9 +1367,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1278,7 +1386,7 @@
/* ----------- GnomeCanvasShape ----------- */
-PyTypeObject PyGnomeCanvasShape_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasShape_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasShape", /* tp_name */
@@ -1308,9 +1416,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1327,7 +1435,7 @@
/* ----------- GnomeCanvasRE ----------- */
-PyTypeObject PyGnomeCanvasRE_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasRE_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasRE", /* tp_name */
@@ -1357,9 +1465,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1376,7 +1484,7 @@
/* ----------- GnomeCanvasRect ----------- */
-PyTypeObject PyGnomeCanvasRect_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasRect_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasRect", /* tp_name */
@@ -1406,9 +1514,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1425,7 +1533,7 @@
/* ----------- GnomeCanvasEllipse ----------- */
-PyTypeObject PyGnomeCanvasEllipse_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasEllipse_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasEllipse", /* tp_name */
@@ -1455,9 +1563,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1474,7 +1582,7 @@
/* ----------- GnomeCanvasPolygon ----------- */
-PyTypeObject PyGnomeCanvasPolygon_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasPolygon_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasPolygon", /* tp_name */
@@ -1504,9 +1612,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1543,15 +1651,16 @@
Py_INCREF(Py_None);
return Py_None;
}
-#line 1547 "canvas.c"
+#line 1655 "canvas.c"
-static PyMethodDef _PyGnomeCanvasBpath_methods[] = {
- { "set_bpath", (PyCFunction)_wrap_gnome_canvas_bpath_set_bpath, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyGnomeCanvasBpath_methods[] = {
+ { "set_bpath", (PyCFunction)_wrap_gnome_canvas_bpath_set_bpath, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyGnomeCanvasBpath_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasBpath_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasBpath", /* tp_name */
@@ -1581,9 +1690,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- _PyGnomeCanvasBpath_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)_PyGnomeCanvasBpath_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1600,7 +1709,7 @@
/* ----------- GnomeCanvasText ----------- */
-PyTypeObject PyGnomeCanvasText_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasText_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasText", /* tp_name */
@@ -1630,9 +1739,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1649,7 +1758,7 @@
/* ----------- GnomeCanvasWidget ----------- */
-PyTypeObject PyGnomeCanvasWidget_Type = {
+PyTypeObject G_GNUC_INTERNAL PyGnomeCanvasWidget_Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"gnome.canvas.CanvasWidget", /* tp_name */
@@ -1679,9 +1788,9 @@
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
+ (struct PyMethodDef*)NULL, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
(descrgetfunc)0, /* tp_descr_get */
@@ -1783,12 +1892,13 @@
return pyg_boxed_new(GNOME_TYPE_CANVAS_PATH_DEF, path, TRUE, TRUE);
}
-#line 1787 "canvas.c"
+#line 1896 "canvas.c"
-PyMethodDef pycanvas_functions[] = {
- { "path_def_new", (PyCFunction)_wrap_gnome_canvas_path_def_new, METH_VARARGS },
- { NULL, NULL, 0 }
+const PyMethodDef pycanvas_functions[] = {
+ { "path_def_new", (PyCFunction)_wrap_gnome_canvas_path_def_new, METH_VARARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -1798,42 +1908,38 @@
PyObject *module;
if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
+ _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
if (_PyGObject_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name GObject from gobject");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gobject");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk._gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkLayout_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Layout");
+ _PyGtkLayout_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Layout");
if (_PyGtkLayout_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Layout from gtk._gtk");
- return;
+ return ;
}
- _PyGtkObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Object");
+ _PyGtkObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Object");
if (_PyGtkObject_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Object from gtk._gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk._gtk");
- return;
+ return ;
}
-#line 1837 "canvas.c"
+#line 1943 "canvas.c"
pyg_register_boxed(d, "CanvasPathDef", GNOME_TYPE_CANVAS_PATH_DEF, &PyGnomeCanvasPathDef_Type);
pygobject_register_class(d, "GnomeCanvas", GNOME_TYPE_CANVAS, &PyGnomeCanvas_Type, Py_BuildValue("(O)", &PyGtkLayout_Type));
pygobject_register_class(d, "GnomeCanvasItem", GNOME_TYPE_CANVAS_ITEM, &PyGnomeCanvasItem_Type, Py_BuildValue("(O)", &PyGtkObject_Type));
Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gcompris.spec 20 Dec 2006 15:59:20 -0000 1.19
+++ gcompris.spec 22 Dec 2006 09:25:05 -0000 1.20
@@ -1,13 +1,14 @@
%define extra_version 2
Name: gcompris
Version: 8.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Educational suite for kids 2-10 years old
Group: Amusements/Games
License: GPL
URL: http://gcompris.net
Source0: http://download.sf.net/%{name}/%{name}-%{version}-%{extra_version}.tar.gz
Patch0: gcompris-8.1-icon.patch
+Patch1: gcompris-8.2.2-py25.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildrequires: libgnomeui-devel sqlite-devel python-devel gnet2-devel
Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -220,6 +221,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1 -z .py25
iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
mv tmp docs/C/gcompris.info
@@ -476,6 +478,10 @@
%changelog
+* Fri Dec 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.2.2-2
+- Update src/boards/canvas.c to canvas.c from latest gnome-python2 to
+ fix build with python 2.5
+
* Wed Dec 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.2.2-1
- New upstream release 8.2.2-2
More information about the scm-commits
mailing list