[Xfce4-commits] r30176 - pyxfce/branches/4.6/gui
Danny Milosavljevic
dannym at xfce.org
Fri Jul 3 00:29:54 CEST 2009
Author: dannym
Date: 2009-07-02 22:29:54 +0000 (Thu, 02 Jul 2009)
New Revision: 30176
Added:
pyxfce/branches/4.6/gui/icontheme.c
pyxfce/branches/4.6/gui/startup-notification.c
pyxfce/branches/4.6/gui/titled_dialog.c
Modified:
pyxfce/branches/4.6/gui/aboutdialog.c
pyxfce/branches/4.6/gui/appmenuitem.c
pyxfce/branches/4.6/gui/clock.c
pyxfce/branches/4.6/gui/colorbutton.c
pyxfce/branches/4.6/gui/decorbutton.c
pyxfce/branches/4.6/gui/decortoggle.c
pyxfce/branches/4.6/gui/dialogs.c
pyxfce/branches/4.6/gui/filechooser.c
pyxfce/branches/4.6/gui/framebox.c
pyxfce/branches/4.6/gui/gdk_extensions.c
pyxfce/branches/4.6/gui/gtk_extensions.c
pyxfce/branches/4.6/gui/gtk_style.c
pyxfce/branches/4.6/gui/gtktoxevent.c
pyxfce/branches/4.6/gui/iconbutton.c
pyxfce/branches/4.6/gui/icons.c
pyxfce/branches/4.6/gui/menubutton.c
pyxfce/branches/4.6/gui/movehandler.c
pyxfce/branches/4.6/gui/scaled_image.c
pyxfce/branches/4.6/gui/session_client.c
pyxfce/branches/4.6/gui/systemtray.c
pyxfce/branches/4.6/gui/togglebutton.c
Log:
pyxfce 4.6: commit pygtk-gen updates in 'gui'.
Modified: pyxfce/branches/4.6/gui/aboutdialog.c
===================================================================
--- pyxfce/branches/4.6/gui/aboutdialog.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/aboutdialog.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -23,7 +23,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceAboutDialog_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceAboutDialog_Type;
#line 29 "aboutdialog.c"
@@ -36,29 +36,32 @@
{
static char* kwlist[] = { NULL };
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":aboutdialog.AboutDialog.__init__", kwlist))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ ":aboutdialog.AboutDialog.__init__",
+ kwlist))
return -1;
pygobject_constructv(self, 0, NULL);
-
if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
+ PyErr_SetString(
+ PyExc_RuntimeError,
+ "could not create aboutdialog.AboutDialog object");
return -1;
}
-
return 0;
}
-
static PyObject *
_wrap_xfce_about_dialog_set_program(PyGObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "value", NULL };
char *value;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_program", kwlist, &value))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAboutDialog.set_program", kwlist, &value))
return NULL;
+
xfce_about_dialog_set_program(XFCE_ABOUT_DIALOG(self->obj), value);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -69,9 +72,11 @@
static char *kwlist[] = { "value", NULL };
char *value;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_version", kwlist, &value))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAboutDialog.set_version", kwlist, &value))
return NULL;
+
xfce_about_dialog_set_version(XFCE_ABOUT_DIALOG(self->obj), value);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -82,9 +87,11 @@
static char *kwlist[] = { "value", NULL };
char *value;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_description", kwlist, &value))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAboutDialog.set_description", kwlist, &value))
return NULL;
+
xfce_about_dialog_set_description(XFCE_ABOUT_DIALOG(self->obj), value);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -95,9 +102,11 @@
static char *kwlist[] = { "value", NULL };
char *value;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_copyright", kwlist, &value))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAboutDialog.set_copyright", kwlist, &value))
return NULL;
+
xfce_about_dialog_set_copyright(XFCE_ABOUT_DIALOG(self->obj), value);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -108,9 +117,11 @@
static char *kwlist[] = { "value", NULL };
char *value;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_license", kwlist, &value))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAboutDialog.set_license", kwlist, &value))
return NULL;
+
xfce_about_dialog_set_license(XFCE_ABOUT_DIALOG(self->obj), value);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -121,9 +132,11 @@
static char *kwlist[] = { "value", NULL };
char *value;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_homepage", kwlist, &value))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAboutDialog.set_homepage", kwlist, &value))
return NULL;
+
xfce_about_dialog_set_homepage(XFCE_ABOUT_DIALOG(self->obj), value);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -134,9 +147,11 @@
static char *kwlist[] = { "icon", NULL };
PyGObject *icon;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceAboutDialog.set_icon", kwlist, &PyGdkPixbuf_Type, &icon))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceAboutDialog.set_icon", kwlist, &PyGdkPixbuf_Type, &icon))
return NULL;
+
xfce_about_dialog_set_icon(XFCE_ABOUT_DIALOG(self->obj), GDK_PIXBUF(icon->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -147,9 +162,11 @@
static char *kwlist[] = { "name", "mail", "task", NULL };
char *name, *mail, *task;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss:XfceAboutDialog.add_credit", kwlist, &name, &mail, &task))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sss:XfceAboutDialog.add_credit", kwlist, &name, &mail, &task))
return NULL;
+
xfce_about_dialog_add_credit(XFCE_ABOUT_DIALOG(self->obj), name, mail, task);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -159,7 +176,9 @@
{
const gchar *ret;
+
ret = xfce_about_dialog_get_program(XFCE_ABOUT_DIALOG(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -171,7 +190,9 @@
{
const gchar *ret;
+
ret = xfce_about_dialog_get_version(XFCE_ABOUT_DIALOG(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -183,7 +204,9 @@
{
const gchar *ret;
+
ret = xfce_about_dialog_get_description(XFCE_ABOUT_DIALOG(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -195,7 +218,9 @@
{
const gchar *ret;
+
ret = xfce_about_dialog_get_copyright(XFCE_ABOUT_DIALOG(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -207,7 +232,9 @@
{
const gchar *ret;
+
ret = xfce_about_dialog_get_license(XFCE_ABOUT_DIALOG(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -219,7 +246,9 @@
{
const gchar *ret;
+
ret = xfce_about_dialog_get_homepage(XFCE_ABOUT_DIALOG(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -231,69 +260,86 @@
{
GdkPixbuf *ret;
+
ret = xfce_about_dialog_get_icon(XFCE_ABOUT_DIALOG(self->obj));
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-static PyMethodDef _PyXfceAboutDialog_methods[] = {
- { "set_program", (PyCFunction)_wrap_xfce_about_dialog_set_program, METH_VARARGS|METH_KEYWORDS },
- { "set_version", (PyCFunction)_wrap_xfce_about_dialog_set_version, METH_VARARGS|METH_KEYWORDS },
- { "set_description", (PyCFunction)_wrap_xfce_about_dialog_set_description, METH_VARARGS|METH_KEYWORDS },
- { "set_copyright", (PyCFunction)_wrap_xfce_about_dialog_set_copyright, METH_VARARGS|METH_KEYWORDS },
- { "set_license", (PyCFunction)_wrap_xfce_about_dialog_set_license, METH_VARARGS|METH_KEYWORDS },
- { "set_homepage", (PyCFunction)_wrap_xfce_about_dialog_set_homepage, METH_VARARGS|METH_KEYWORDS },
- { "set_icon", (PyCFunction)_wrap_xfce_about_dialog_set_icon, METH_VARARGS|METH_KEYWORDS },
- { "add_credit", (PyCFunction)_wrap_xfce_about_dialog_add_credit, METH_VARARGS|METH_KEYWORDS },
- { "get_program", (PyCFunction)_wrap_xfce_about_dialog_get_program, METH_NOARGS },
- { "get_version", (PyCFunction)_wrap_xfce_about_dialog_get_version, METH_NOARGS },
- { "get_description", (PyCFunction)_wrap_xfce_about_dialog_get_description, METH_NOARGS },
- { "get_copyright", (PyCFunction)_wrap_xfce_about_dialog_get_copyright, METH_NOARGS },
- { "get_license", (PyCFunction)_wrap_xfce_about_dialog_get_license, METH_NOARGS },
- { "get_homepage", (PyCFunction)_wrap_xfce_about_dialog_get_homepage, METH_NOARGS },
- { "get_icon", (PyCFunction)_wrap_xfce_about_dialog_get_icon, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceAboutDialog_methods[] = {
+ { "set_program", (PyCFunction)_wrap_xfce_about_dialog_set_program, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_version", (PyCFunction)_wrap_xfce_about_dialog_set_version, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_description", (PyCFunction)_wrap_xfce_about_dialog_set_description, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_copyright", (PyCFunction)_wrap_xfce_about_dialog_set_copyright, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_license", (PyCFunction)_wrap_xfce_about_dialog_set_license, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_homepage", (PyCFunction)_wrap_xfce_about_dialog_set_homepage, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_icon", (PyCFunction)_wrap_xfce_about_dialog_set_icon, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "add_credit", (PyCFunction)_wrap_xfce_about_dialog_add_credit, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_program", (PyCFunction)_wrap_xfce_about_dialog_get_program, METH_NOARGS,
+ NULL },
+ { "get_version", (PyCFunction)_wrap_xfce_about_dialog_get_version, METH_NOARGS,
+ NULL },
+ { "get_description", (PyCFunction)_wrap_xfce_about_dialog_get_description, METH_NOARGS,
+ NULL },
+ { "get_copyright", (PyCFunction)_wrap_xfce_about_dialog_get_copyright, METH_NOARGS,
+ NULL },
+ { "get_license", (PyCFunction)_wrap_xfce_about_dialog_get_license, METH_NOARGS,
+ NULL },
+ { "get_homepage", (PyCFunction)_wrap_xfce_about_dialog_get_homepage, METH_NOARGS,
+ NULL },
+ { "get_icon", (PyCFunction)_wrap_xfce_about_dialog_get_icon, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceAboutDialog_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceAboutDialog_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "aboutdialog.AboutDialog", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "aboutdialog.AboutDialog", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceAboutDialog_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceAboutDialog_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_about_dialog_new_empty, /* tp_init */
+ (initproc)_wrap_xfce_about_dialog_new_empty, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -304,8 +350,8 @@
/* ----------- functions ----------- */
-PyMethodDef pyaboutdialog_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pyaboutdialog_functions[] = {
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -315,50 +361,44 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkDialog_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Dialog");
+ _PyGtkDialog_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Dialog");
if (_PyGtkDialog_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Dialog from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
+ _PyGdkPixbuf_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Pixbuf");
if (_PyGdkPixbuf_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Pixbuf from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 362 "aboutdialog.c"
+#line 402 "aboutdialog.c"
pygobject_register_class(d, "XfceAboutDialog", XFCE_TYPE_ABOUT_DIALOG, &PyXfceAboutDialog_Type, Py_BuildValue("(O)", &PyGtkDialog_Type));
pyg_set_object_has_new_constructor(XFCE_TYPE_ABOUT_DIALOG);
}
Modified: pyxfce/branches/4.6/gui/appmenuitem.c
===================================================================
--- pyxfce/branches/4.6/gui/appmenuitem.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/appmenuitem.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -23,7 +23,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceAppMenuItem_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceAppMenuItem_Type;
#line 29 "appmenuitem.c"
@@ -36,29 +36,32 @@
{
static char* kwlist[] = { NULL };
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":appmenuitem.AppMenuItem.__init__", kwlist))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ ":appmenuitem.AppMenuItem.__init__",
+ kwlist))
return -1;
pygobject_constructv(self, 0, NULL);
-
if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
+ PyErr_SetString(
+ PyExc_RuntimeError,
+ "could not create appmenuitem.AppMenuItem object");
return -1;
}
-
return 0;
}
-
static PyObject *
_wrap_xfce_app_menu_item_set_name(PyGObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "name", NULL };
char *name;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAppMenuItem.set_name", kwlist, &name))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAppMenuItem.set_name", kwlist, &name))
return NULL;
+
xfce_app_menu_item_set_name(XFCE_APP_MENU_ITEM(self->obj), name);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -69,9 +72,11 @@
static char *kwlist[] = { "filename", NULL };
char *filename;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAppMenuItem.set_icon_name", kwlist, &filename))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAppMenuItem.set_icon_name", kwlist, &filename))
return NULL;
+
xfce_app_menu_item_set_icon_name(XFCE_APP_MENU_ITEM(self->obj), filename);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -82,9 +87,11 @@
static char *kwlist[] = { "command", NULL };
char *command;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAppMenuItem.set_command", kwlist, &command))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceAppMenuItem.set_command", kwlist, &command))
return NULL;
+
xfce_app_menu_item_set_command(XFCE_APP_MENU_ITEM(self->obj), command);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -95,9 +102,11 @@
static char *kwlist[] = { "needs_term", NULL };
int needs_term;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceAppMenuItem.set_needs_term", kwlist, &needs_term))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceAppMenuItem.set_needs_term", kwlist, &needs_term))
return NULL;
+
xfce_app_menu_item_set_needs_term(XFCE_APP_MENU_ITEM(self->obj), needs_term);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -108,9 +117,11 @@
static char *kwlist[] = { "snotify", NULL };
int snotify;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceAppMenuItem.set_startup_notification", kwlist, &snotify))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceAppMenuItem.set_startup_notification", kwlist, &snotify))
return NULL;
+
xfce_app_menu_item_set_startup_notification(XFCE_APP_MENU_ITEM(self->obj), snotify);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -120,7 +131,9 @@
{
const gchar *ret;
+
ret = xfce_app_menu_item_get_name(XFCE_APP_MENU_ITEM(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -132,7 +145,9 @@
{
const gchar *ret;
+
ret = xfce_app_menu_item_get_icon_name(XFCE_APP_MENU_ITEM(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -144,7 +159,9 @@
{
const gchar *ret;
+
ret = xfce_app_menu_item_get_command(XFCE_APP_MENU_ITEM(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -156,7 +173,9 @@
{
int ret;
+
ret = xfce_app_menu_item_get_needs_term(XFCE_APP_MENU_ITEM(self->obj));
+
return PyBool_FromLong(ret);
}
@@ -166,64 +185,76 @@
{
int ret;
+
ret = xfce_app_menu_item_get_startup_notification(XFCE_APP_MENU_ITEM(self->obj));
+
return PyBool_FromLong(ret);
}
-static PyMethodDef _PyXfceAppMenuItem_methods[] = {
- { "set_name", (PyCFunction)_wrap_xfce_app_menu_item_set_name, METH_VARARGS|METH_KEYWORDS },
- { "set_icon_name", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_name, METH_VARARGS|METH_KEYWORDS },
- { "set_command", (PyCFunction)_wrap_xfce_app_menu_item_set_command, METH_VARARGS|METH_KEYWORDS },
- { "set_needs_term", (PyCFunction)_wrap_xfce_app_menu_item_set_needs_term, METH_VARARGS|METH_KEYWORDS },
- { "set_startup_notification", (PyCFunction)_wrap_xfce_app_menu_item_set_startup_notification, METH_VARARGS|METH_KEYWORDS },
- { "get_name", (PyCFunction)_wrap_xfce_app_menu_item_get_name, METH_NOARGS },
- { "get_icon_name", (PyCFunction)_wrap_xfce_app_menu_item_get_icon_name, METH_NOARGS },
- { "get_command", (PyCFunction)_wrap_xfce_app_menu_item_get_command, METH_NOARGS },
- { "get_needs_term", (PyCFunction)_wrap_xfce_app_menu_item_get_needs_term, METH_NOARGS },
- { "get_startup_notification", (PyCFunction)_wrap_xfce_app_menu_item_get_startup_notification, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceAppMenuItem_methods[] = {
+ { "set_name", (PyCFunction)_wrap_xfce_app_menu_item_set_name, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_icon_name", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_name, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_command", (PyCFunction)_wrap_xfce_app_menu_item_set_command, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_needs_term", (PyCFunction)_wrap_xfce_app_menu_item_set_needs_term, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_startup_notification", (PyCFunction)_wrap_xfce_app_menu_item_set_startup_notification, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_name", (PyCFunction)_wrap_xfce_app_menu_item_get_name, METH_NOARGS,
+ NULL },
+ { "get_icon_name", (PyCFunction)_wrap_xfce_app_menu_item_get_icon_name, METH_NOARGS,
+ NULL },
+ { "get_command", (PyCFunction)_wrap_xfce_app_menu_item_get_command, METH_NOARGS,
+ NULL },
+ { "get_needs_term", (PyCFunction)_wrap_xfce_app_menu_item_get_needs_term, METH_NOARGS,
+ NULL },
+ { "get_startup_notification", (PyCFunction)_wrap_xfce_app_menu_item_get_startup_notification, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceAppMenuItem_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceAppMenuItem_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "appmenuitem.AppMenuItem", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "appmenuitem.AppMenuItem", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceAppMenuItem_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceAppMenuItem_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_app_menu_item_new, /* tp_init */
+ (initproc)_wrap_xfce_app_menu_item_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -241,9 +272,11 @@
char *label;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:app_menu_item_new_with_label", kwlist, &label))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:app_menu_item_new_with_label", kwlist, &label))
return NULL;
+
ret = xfce_app_menu_item_new_with_label(label);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -255,9 +288,11 @@
char *label;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:app_menu_item_new_with_mnemonic", kwlist, &label))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:app_menu_item_new_with_mnemonic", kwlist, &label))
return NULL;
+
ret = xfce_app_menu_item_new_with_mnemonic(label);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -269,9 +304,11 @@
char *label, *command;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss:app_menu_item_new_with_command", kwlist, &label, &command))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ss:app_menu_item_new_with_command", kwlist, &label, &command))
return NULL;
+
ret = xfce_app_menu_item_new_with_command(label, command);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -284,9 +321,11 @@
int needs_term, snotify;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sssii:app_menu_item_new_full", kwlist, &label, &command, &icon_filename, &needs_term, &snotify))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sssii:app_menu_item_new_full", kwlist, &label, &command, &icon_filename, &needs_term, &snotify))
return NULL;
+
ret = xfce_app_menu_item_new_full(label, command, icon_filename, needs_term, snotify);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -299,21 +338,38 @@
int show_icon;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i:app_menu_item_new_from_desktop_entry", kwlist, &PyXfceDesktopEntry_Type, &entry, &show_icon))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!i:app_menu_item_new_from_desktop_entry", kwlist, &PyXfceDesktopEntry_Type, &entry, &show_icon))
return NULL;
+
ret = xfce_app_menu_item_new_from_desktop_entry(XFCE_DESKTOP_ENTRY(entry->obj), show_icon);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
static PyObject *
+_wrap_xfce_app_menu_item_set_icon_theme_name(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "theme_name", NULL };
+ char *theme_name;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:app_menu_item_set_icon_theme_name", kwlist, &theme_name))
+ return NULL;
+
+ xfce_app_menu_item_set_icon_theme_name(theme_name);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
_wrap_xfce_app_menu_item_set_icon_size(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "icon_size", NULL };
PyObject *py_icon_size = NULL;
guint icon_size = 0;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:app_menu_item_set_icon_size", kwlist, &py_icon_size))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:app_menu_item_set_icon_size", kwlist, &py_icon_size))
return NULL;
if (py_icon_size) {
if (PyLong_Check(py_icon_size))
@@ -325,33 +381,29 @@
if (PyErr_Occurred())
return NULL;
}
+
xfce_app_menu_item_set_icon_size(icon_size);
+
Py_INCREF(Py_None);
return Py_None;
}
-static PyObject *
-_wrap_xfce_app_menu_item_set_icon_theme_name(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "theme_name", NULL };
- char *theme_name;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:app_menu_item_set_icon_theme_name", kwlist, &theme_name))
- return NULL;
- xfce_app_menu_item_set_icon_theme_name(theme_name);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-PyMethodDef pyappmenuitem_functions[] = {
- { "app_menu_item_new_with_label", (PyCFunction)_wrap_xfce_app_menu_item_new_with_label, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_new_with_mnemonic", (PyCFunction)_wrap_xfce_app_menu_item_new_with_mnemonic, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_new_with_command", (PyCFunction)_wrap_xfce_app_menu_item_new_with_command, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_new_full", (PyCFunction)_wrap_xfce_app_menu_item_new_full, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_new_from_desktop_entry", (PyCFunction)_wrap_xfce_app_menu_item_new_from_desktop_entry, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_set_icon_size", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_size, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_set_icon_theme_name", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_theme_name, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pyappmenuitem_functions[] = {
+ { "app_menu_item_new_with_label", (PyCFunction)_wrap_xfce_app_menu_item_new_with_label, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "app_menu_item_new_with_mnemonic", (PyCFunction)_wrap_xfce_app_menu_item_new_with_mnemonic, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "app_menu_item_new_with_command", (PyCFunction)_wrap_xfce_app_menu_item_new_with_command, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "app_menu_item_new_full", (PyCFunction)_wrap_xfce_app_menu_item_new_full, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "app_menu_item_new_from_desktop_entry", (PyCFunction)_wrap_xfce_app_menu_item_new_from_desktop_entry, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "app_menu_item_set_icon_theme_name", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_theme_name, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "app_menu_item_set_icon_size", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_size, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -361,50 +413,44 @@
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("xfce4.util")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyXfceDesktopEntry_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "DesktopEntry");
+ _PyXfceDesktopEntry_Type = (PyTypeObject *)PyObject_GetAttrString(module, "DesktopEntry");
if (_PyXfceDesktopEntry_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name DesktopEntry from xfce4.util");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import xfce4.util");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkImageMenuItem_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "ImageMenuItem");
+ _PyGtkImageMenuItem_Type = (PyTypeObject *)PyObject_GetAttrString(module, "ImageMenuItem");
if (_PyGtkImageMenuItem_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name ImageMenuItem from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 408 "appmenuitem.c"
+#line 454 "appmenuitem.c"
pygobject_register_class(d, "XfceAppMenuItem", XFCE_TYPE_APP_MENU_ITEM, &PyXfceAppMenuItem_Type, Py_BuildValue("(O)", &PyGtkImageMenuItem_Type));
pyg_set_object_has_new_constructor(XFCE_TYPE_APP_MENU_ITEM);
}
Modified: pyxfce/branches/4.6/gui/clock.c
===================================================================
--- pyxfce/branches/4.6/gui/clock.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/clock.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -29,7 +29,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceClock_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceClock_Type;
#line 35 "clock.c"
@@ -42,29 +42,32 @@
{
static char* kwlist[] = { NULL };
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":clock.Clock.__init__", kwlist))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ ":clock.Clock.__init__",
+ kwlist))
return -1;
pygobject_constructv(self, 0, NULL);
-
if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
+ PyErr_SetString(
+ PyExc_RuntimeError,
+ "could not create clock.Clock object");
return -1;
}
-
return 0;
}
-
static PyObject *
_wrap_xfce_clock_show_ampm(PyGObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "show", NULL };
int show;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceClock.show_ampm", kwlist, &show))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceClock.show_ampm", kwlist, &show))
return NULL;
+
xfce_clock_show_ampm(XFCE_CLOCK(self->obj), show);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -72,7 +75,9 @@
static PyObject *
_wrap_xfce_clock_ampm_toggle(PyGObject *self)
{
+
xfce_clock_ampm_toggle(XFCE_CLOCK(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -82,7 +87,9 @@
{
int ret;
+
ret = xfce_clock_ampm_shown(XFCE_CLOCK(self->obj));
+
return PyBool_FromLong(ret);
}
@@ -93,9 +100,11 @@
static char *kwlist[] = { "show", NULL };
int show;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceClock.show_secs", kwlist, &show))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceClock.show_secs", kwlist, &show))
return NULL;
+
xfce_clock_show_secs(XFCE_CLOCK(self->obj), show);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -103,7 +112,9 @@
static PyObject *
_wrap_xfce_clock_secs_toggle(PyGObject *self)
{
+
xfce_clock_secs_toggle(XFCE_CLOCK(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -113,7 +124,9 @@
{
int ret;
+
ret = xfce_clock_secs_shown(XFCE_CLOCK(self->obj));
+
return PyBool_FromLong(ret);
}
@@ -124,9 +137,11 @@
static char *kwlist[] = { "show", NULL };
int show;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceClock.show_military", kwlist, &show))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceClock.show_military", kwlist, &show))
return NULL;
+
xfce_clock_show_military(XFCE_CLOCK(self->obj), show);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -134,7 +149,9 @@
static PyObject *
_wrap_xfce_clock_military_toggle(PyGObject *self)
{
+
xfce_clock_military_toggle(XFCE_CLOCK(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -144,7 +161,9 @@
{
int ret;
+
ret = xfce_clock_military_shown(XFCE_CLOCK(self->obj));
+
return PyBool_FromLong(ret);
}
@@ -156,7 +175,7 @@
PyObject *py_interval = NULL;
guint interval = 0;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceClock.set_interval", kwlist, &py_interval))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceClock.set_interval", kwlist, &py_interval))
return NULL;
if (py_interval) {
if (PyLong_Check(py_interval))
@@ -168,7 +187,9 @@
if (PyErr_Occurred())
return NULL;
}
+
xfce_clock_set_interval(XFCE_CLOCK(self->obj), interval);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -178,7 +199,9 @@
{
guint ret;
+
ret = xfce_clock_get_interval(XFCE_CLOCK(self->obj));
+
return PyLong_FromUnsignedLong(ret);
}
@@ -189,11 +212,13 @@
XfceClockLedSize size;
PyObject *py_size = NULL;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceClock.set_led_size", kwlist, &py_size))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceClock.set_led_size", kwlist, &py_size))
return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_CLOCK_LED_SIZE, py_size, (gint *)&size))
+ if (pyg_enum_get_value(XFCE_TYPE_CLOCK_LED_SIZE, py_size, (gpointer)&size))
return NULL;
+
xfce_clock_set_led_size(XFCE_CLOCK(self->obj), size);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -203,14 +228,18 @@
{
gint ret;
+
ret = xfce_clock_get_led_size(XFCE_CLOCK(self->obj));
+
return pyg_enum_from_gtype(XFCE_TYPE_CLOCK_LED_SIZE, ret);
}
static PyObject *
_wrap_xfce_clock_suspend(PyGObject *self)
{
+
xfce_clock_suspend(XFCE_CLOCK(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -218,7 +247,9 @@
static PyObject *
_wrap_xfce_clock_resume(PyGObject *self)
{
+
xfce_clock_resume(XFCE_CLOCK(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -230,11 +261,13 @@
XfceClockMode mode;
PyObject *py_mode = NULL;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceClock.set_mode", kwlist, &py_mode))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceClock.set_mode", kwlist, &py_mode))
return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_CLOCK_MODE, py_mode, (gint *)&mode))
+ if (pyg_enum_get_value(XFCE_TYPE_CLOCK_MODE, py_mode, (gpointer)&mode))
return NULL;
+
xfce_clock_set_mode(XFCE_CLOCK(self->obj), mode);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -242,81 +275,151 @@
static PyObject *
_wrap_xfce_clock_toggle_mode(PyGObject *self)
{
+
xfce_clock_toggle_mode(XFCE_CLOCK(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
static PyObject *
+_wrap_xfce_clock_set_format(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "format", NULL };
+ char *format;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceClock.set_format", kwlist, &format))
+ return NULL;
+
+ xfce_clock_set_format(XFCE_CLOCK(self->obj), format);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
+_wrap_xfce_clock_set_formatted_view(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "formatted", NULL };
+ int formatted;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceClock.set_formatted_view", kwlist, &formatted))
+ return NULL;
+
+ xfce_clock_set_formatted_view(XFCE_CLOCK(self->obj), formatted);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
+_wrap_xfce_clock_get_formatted_view(PyGObject *self)
+{
+ int ret;
+
+
+ ret = xfce_clock_get_formatted_view(XFCE_CLOCK(self->obj));
+
+ return PyBool_FromLong(ret);
+
+}
+
+static PyObject *
_wrap_xfce_clock_get_mode(PyGObject *self)
{
gint ret;
+
ret = xfce_clock_get_mode(XFCE_CLOCK(self->obj));
+
return pyg_enum_from_gtype(XFCE_TYPE_CLOCK_MODE, ret);
}
-static PyMethodDef _PyXfceClock_methods[] = {
- { "show_ampm", (PyCFunction)_wrap_xfce_clock_show_ampm, METH_VARARGS|METH_KEYWORDS },
- { "ampm_toggle", (PyCFunction)_wrap_xfce_clock_ampm_toggle, METH_NOARGS },
- { "ampm_shown", (PyCFunction)_wrap_xfce_clock_ampm_shown, METH_NOARGS },
- { "show_secs", (PyCFunction)_wrap_xfce_clock_show_secs, METH_VARARGS|METH_KEYWORDS },
- { "secs_toggle", (PyCFunction)_wrap_xfce_clock_secs_toggle, METH_NOARGS },
- { "secs_shown", (PyCFunction)_wrap_xfce_clock_secs_shown, METH_NOARGS },
- { "show_military", (PyCFunction)_wrap_xfce_clock_show_military, METH_VARARGS|METH_KEYWORDS },
- { "military_toggle", (PyCFunction)_wrap_xfce_clock_military_toggle, METH_NOARGS },
- { "military_shown", (PyCFunction)_wrap_xfce_clock_military_shown, METH_NOARGS },
- { "set_interval", (PyCFunction)_wrap_xfce_clock_set_interval, METH_VARARGS|METH_KEYWORDS },
- { "get_interval", (PyCFunction)_wrap_xfce_clock_get_interval, METH_NOARGS },
- { "set_led_size", (PyCFunction)_wrap_xfce_clock_set_led_size, METH_VARARGS|METH_KEYWORDS },
- { "get_led_size", (PyCFunction)_wrap_xfce_clock_get_led_size, METH_NOARGS },
- { "suspend", (PyCFunction)_wrap_xfce_clock_suspend, METH_NOARGS },
- { "resume", (PyCFunction)_wrap_xfce_clock_resume, METH_NOARGS },
- { "set_mode", (PyCFunction)_wrap_xfce_clock_set_mode, METH_VARARGS|METH_KEYWORDS },
- { "toggle_mode", (PyCFunction)_wrap_xfce_clock_toggle_mode, METH_NOARGS },
- { "get_mode", (PyCFunction)_wrap_xfce_clock_get_mode, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceClock_methods[] = {
+ { "show_ampm", (PyCFunction)_wrap_xfce_clock_show_ampm, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "ampm_toggle", (PyCFunction)_wrap_xfce_clock_ampm_toggle, METH_NOARGS,
+ NULL },
+ { "ampm_shown", (PyCFunction)_wrap_xfce_clock_ampm_shown, METH_NOARGS,
+ NULL },
+ { "show_secs", (PyCFunction)_wrap_xfce_clock_show_secs, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "secs_toggle", (PyCFunction)_wrap_xfce_clock_secs_toggle, METH_NOARGS,
+ NULL },
+ { "secs_shown", (PyCFunction)_wrap_xfce_clock_secs_shown, METH_NOARGS,
+ NULL },
+ { "show_military", (PyCFunction)_wrap_xfce_clock_show_military, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "military_toggle", (PyCFunction)_wrap_xfce_clock_military_toggle, METH_NOARGS,
+ NULL },
+ { "military_shown", (PyCFunction)_wrap_xfce_clock_military_shown, METH_NOARGS,
+ NULL },
+ { "set_interval", (PyCFunction)_wrap_xfce_clock_set_interval, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_interval", (PyCFunction)_wrap_xfce_clock_get_interval, METH_NOARGS,
+ NULL },
+ { "set_led_size", (PyCFunction)_wrap_xfce_clock_set_led_size, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_led_size", (PyCFunction)_wrap_xfce_clock_get_led_size, METH_NOARGS,
+ NULL },
+ { "suspend", (PyCFunction)_wrap_xfce_clock_suspend, METH_NOARGS,
+ NULL },
+ { "resume", (PyCFunction)_wrap_xfce_clock_resume, METH_NOARGS,
+ NULL },
+ { "set_mode", (PyCFunction)_wrap_xfce_clock_set_mode, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "toggle_mode", (PyCFunction)_wrap_xfce_clock_toggle_mode, METH_NOARGS,
+ NULL },
+ { "set_format", (PyCFunction)_wrap_xfce_clock_set_format, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_formatted_view", (PyCFunction)_wrap_xfce_clock_set_formatted_view, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_formatted_view", (PyCFunction)_wrap_xfce_clock_get_formatted_view, METH_NOARGS,
+ NULL },
+ { "get_mode", (PyCFunction)_wrap_xfce_clock_get_mode, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceClock_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceClock_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "clock.Clock", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "clock.Clock", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceClock_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceClock_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_clock_new, /* tp_init */
+ (initproc)_wrap_xfce_clock_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -327,8 +430,8 @@
/* ----------- functions ----------- */
-PyMethodDef pyclock_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pyclock_functions[] = {
+ { NULL, NULL, 0, NULL }
};
@@ -337,6 +440,9 @@
void
pyclock_add_constants(PyObject *module, const gchar *strip_prefix)
{
+#ifdef VERSION
+ PyModule_AddStringConstant(module, "__version__", VERSION);
+#endif
pyg_enum_add(module, "ClockMode", strip_prefix, XFCE_TYPE_CLOCK_MODE);
pyg_enum_add(module, "ClockLedSize", strip_prefix, XFCE_TYPE_CLOCK_LED_SIZE);
@@ -351,36 +457,32 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
+ _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 384 "clock.c"
+#line 486 "clock.c"
pygobject_register_class(d, "XfceClock", XFCE_TYPE_CLOCK, &PyXfceClock_Type, Py_BuildValue("(O)", &PyGtkWidget_Type));
pyg_set_object_has_new_constructor(XFCE_TYPE_CLOCK);
}
Modified: pyxfce/branches/4.6/gui/colorbutton.c
===================================================================
--- pyxfce/branches/4.6/gui/colorbutton.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/colorbutton.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -33,7 +33,7 @@
GdkColor *color = NULL;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:color_button_new_with_color", kwlist, &py_color))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:color_button_new_with_color", kwlist, &py_color))
return NULL;
if (pyg_boxed_check(py_color, GDK_TYPE_COLOR))
color = pyg_boxed_get(py_color, GdkColor);
@@ -41,14 +41,17 @@
PyErr_SetString(PyExc_TypeError, "color should be a GdkColor");
return NULL;
}
+
ret = xfce_color_button_new_with_color(color);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-PyMethodDef pycolorbutton_functions[] = {
- { "color_button_new_with_color", (PyCFunction)_wrap_xfce_color_button_new_with_color, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pycolorbutton_functions[] = {
+ { "color_button_new_with_color", (PyCFunction)_wrap_xfce_color_button_new_with_color, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -58,20 +61,18 @@
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 ;
}
-#line 77 "colorbutton.c"
+#line 78 "colorbutton.c"
}
Modified: pyxfce/branches/4.6/gui/decorbutton.c
===================================================================
--- pyxfce/branches/4.6/gui/decorbutton.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/decorbutton.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -26,7 +26,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceDecorbutton_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceDecorbutton_Type;
#line 32 "decorbutton.c"
@@ -41,9 +41,9 @@
PyObject *py_type = NULL;
XfceDecorbuttonType type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceDecorbutton.__init__", kwlist, &py_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceDecorbutton.__init__", kwlist, &py_type))
return -1;
- if (pyg_enum_get_value(XFCE_TYPE_DECORBUTTON_TYPE, py_type, (gint *)&type))
+ if (pyg_enum_get_value(XFCE_TYPE_DECORBUTTON_TYPE, py_type, (gpointer)&type))
return -1;
self->obj = (GObject *)xfce_decorbutton_new(type);
@@ -55,45 +55,45 @@
return 0;
}
-PyTypeObject PyXfceDecorbutton_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceDecorbutton_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "clock.Decorbutton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "clock.Decorbutton", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (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 */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_decorbutton_new, /* tp_init */
+ (initproc)_wrap_xfce_decorbutton_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -104,8 +104,8 @@
/* ----------- functions ----------- */
-PyMethodDef pydecorbutton_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pydecorbutton_functions[] = {
+ { NULL, NULL, 0, NULL }
};
@@ -114,6 +114,9 @@
void
pydecorbutton_add_constants(PyObject *module, const gchar *strip_prefix)
{
+#ifdef VERSION
+ PyModule_AddStringConstant(module, "__version__", VERSION);
+#endif
pyg_enum_add(module, "DecorbuttonType", strip_prefix, XFCE_TYPE_DECORBUTTON_TYPE);
if (PyErr_Occurred())
@@ -127,35 +130,31 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkMisc_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Misc");
+ _PyGtkMisc_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Misc");
if (_PyGtkMisc_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Misc from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 160 "decorbutton.c"
+#line 159 "decorbutton.c"
pygobject_register_class(d, "XfceDecorbutton", XFCE_TYPE_DECORBUTTON, &PyXfceDecorbutton_Type, Py_BuildValue("(O)", &PyGtkMisc_Type));
}
Modified: pyxfce/branches/4.6/gui/decortoggle.c
===================================================================
--- pyxfce/branches/4.6/gui/decortoggle.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/decortoggle.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -26,7 +26,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceDecortoggle_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceDecortoggle_Type;
#line 32 "decortoggle.c"
@@ -41,9 +41,9 @@
PyObject *py_arrow_type = NULL;
GtkArrowType arrow_type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceDecortoggle.__init__", kwlist, &py_arrow_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceDecortoggle.__init__", kwlist, &py_arrow_type))
return -1;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gint *)&arrow_type))
+ if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gpointer)&arrow_type))
return -1;
self->obj = (GObject *)xfce_decortoggle_new(arrow_type);
@@ -58,7 +58,9 @@
static PyObject *
_wrap_xfce_decortoggle_toggled(PyGObject *self)
{
+
xfce_decortoggle_toggled(XFCE_DECORTOGGLE(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -69,9 +71,11 @@
static char *kwlist[] = { "is_active", NULL };
int is_active;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceDecortoggle.set_active", kwlist, &is_active))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceDecortoggle.set_active", kwlist, &is_active))
return NULL;
+
xfce_decortoggle_set_active(XFCE_DECORTOGGLE(self->obj), is_active);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -83,11 +87,13 @@
PyObject *py_arrow_type = NULL;
GtkArrowType arrow_type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceDecortoggle.set_arrow_type", kwlist, &py_arrow_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceDecortoggle.set_arrow_type", kwlist, &py_arrow_type))
return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gint *)&arrow_type))
+ if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gpointer)&arrow_type))
return NULL;
+
xfce_decortoggle_set_arrow_type(XFCE_DECORTOGGLE(self->obj), arrow_type);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -97,57 +103,63 @@
{
gint ret;
+
ret = xfce_decortoggle_get_arrow_type(XFCE_DECORTOGGLE(self->obj));
+
return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
}
-static PyMethodDef _PyXfceDecortoggle_methods[] = {
- { "toggled", (PyCFunction)_wrap_xfce_decortoggle_toggled, METH_NOARGS },
- { "set_active", (PyCFunction)_wrap_xfce_decortoggle_set_active, METH_VARARGS|METH_KEYWORDS },
- { "set_arrow_type", (PyCFunction)_wrap_xfce_decortoggle_set_arrow_type, METH_VARARGS|METH_KEYWORDS },
- { "get_arrow_type", (PyCFunction)_wrap_xfce_decortoggle_get_arrow_type, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceDecortoggle_methods[] = {
+ { "toggled", (PyCFunction)_wrap_xfce_decortoggle_toggled, METH_NOARGS,
+ NULL },
+ { "set_active", (PyCFunction)_wrap_xfce_decortoggle_set_active, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_arrow_type", (PyCFunction)_wrap_xfce_decortoggle_set_arrow_type, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_arrow_type", (PyCFunction)_wrap_xfce_decortoggle_get_arrow_type, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceDecortoggle_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceDecortoggle_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "decortoggle.Decortoggle", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "decortoggle.Decortoggle", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceDecortoggle_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceDecortoggle_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_decortoggle_new, /* tp_init */
+ (initproc)_wrap_xfce_decortoggle_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -158,8 +170,8 @@
/* ----------- functions ----------- */
-PyMethodDef pydecortoggle_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pydecortoggle_functions[] = {
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -169,41 +181,37 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkMisc_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Misc");
+ _PyGtkMisc_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Misc");
if (_PyGtkMisc_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Misc from gtk");
- return;
+ return ;
}
- _PyGtkArrow_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Arrow");
+ _PyGtkArrow_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Arrow");
if (_PyGtkArrow_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Arrow from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 208 "decortoggle.c"
+#line 216 "decortoggle.c"
pygobject_register_class(d, "XfceDecortoggle", XFCE_TYPE_DECORTOGGLE, &PyXfceDecortoggle_Type, Py_BuildValue("(O)", &PyGtkMisc_Type));
}
Modified: pyxfce/branches/4.6/gui/dialogs.c
===================================================================
--- pyxfce/branches/4.6/gui/dialogs.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/dialogs.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -29,117 +29,22 @@
/* ----------- functions ----------- */
static PyObject *
-_wrap_show_info(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:show_info", kwlist, &text))
- return NULL;
- show_info(text);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_show_warning(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:show_warning", kwlist, &text))
- return NULL;
- show_warning(text);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_show_error(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:show_error", kwlist, &text))
- return NULL;
- show_error(text);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_create_header(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "icon", "text", NULL };
- PyGObject *icon;
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:create_header", kwlist, &PyGdkPixbuf_Type, &icon, &text))
- return NULL;
- ret = create_header(GDK_PIXBUF(icon->obj), text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_create_header_with_image(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "image", "text", NULL };
- PyGObject *image;
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:create_header_with_image", kwlist, &PyGtkWidget_Type, &image, &text))
- return NULL;
- ret = create_header_with_image(GTK_WIDGET(image->obj), text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_small_label(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:small_label", kwlist, &text))
- return NULL;
- ret = small_label(text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_exec_command(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "command", NULL };
- char *command;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:exec_command", kwlist, &command))
- return NULL;
- ret = exec_command(command);
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
_wrap_xfce_confirm(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "text", "stock_id", "action", NULL };
char *text, *stock_id, *action;
int ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss:confirm", kwlist, &text, &stock_id, &action))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sss:confirm", kwlist, &text, &stock_id, &action))
return NULL;
+
ret = xfce_confirm(text, stock_id, action);
+
return PyBool_FromLong(ret);
}
-#line 27 "dialogs.override"
+#line 38 "dialogs.override"
static PyObject *
_wrap_xfce_create_header(PyObject *self, PyObject *args, PyObject *kwargs)
{
@@ -163,7 +68,7 @@
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-#line 167 "dialogs.c"
+#line 72 "dialogs.c"
static PyObject *
@@ -174,9 +79,11 @@
char *text;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:create_header_with_image", kwlist, &PyGtkWidget_Type, &image, &text))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!s:create_header_with_image", kwlist, &PyGtkWidget_Type, &image, &text))
return NULL;
+
ret = xfce_create_header_with_image(GTK_WIDGET(image->obj), text);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -188,9 +95,11 @@
char *text;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:create_small_label", kwlist, &text))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:create_small_label", kwlist, &text))
return NULL;
+
ret = xfce_create_small_label(text);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -202,27 +111,27 @@
char *stock, *text;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss:create_mixed_button", kwlist, &stock, &text))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ss:create_mixed_button", kwlist, &stock, &text))
return NULL;
+
ret = xfce_create_mixed_button(stock, text);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-PyMethodDef pydialogs_functions[] = {
- { "show_info", (PyCFunction)_wrap_show_info, METH_VARARGS|METH_KEYWORDS },
- { "show_warning", (PyCFunction)_wrap_show_warning, METH_VARARGS|METH_KEYWORDS },
- { "show_error", (PyCFunction)_wrap_show_error, METH_VARARGS|METH_KEYWORDS },
- { "create_header", (PyCFunction)_wrap_create_header, METH_VARARGS|METH_KEYWORDS },
- { "create_header_with_image", (PyCFunction)_wrap_create_header_with_image, METH_VARARGS|METH_KEYWORDS },
- { "small_label", (PyCFunction)_wrap_small_label, METH_VARARGS|METH_KEYWORDS },
- { "exec_command", (PyCFunction)_wrap_exec_command, METH_VARARGS|METH_KEYWORDS },
- { "confirm", (PyCFunction)_wrap_xfce_confirm, METH_VARARGS|METH_KEYWORDS },
- { "create_header", (PyCFunction)_wrap_xfce_create_header, METH_VARARGS|METH_KEYWORDS },
- { "create_header_with_image", (PyCFunction)_wrap_xfce_create_header_with_image, METH_VARARGS|METH_KEYWORDS },
- { "create_small_label", (PyCFunction)_wrap_xfce_create_small_label, METH_VARARGS|METH_KEYWORDS },
- { "create_mixed_button", (PyCFunction)_wrap_xfce_create_mixed_button, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pydialogs_functions[] = {
+ { "confirm", (PyCFunction)_wrap_xfce_confirm, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "create_header", (PyCFunction)_wrap_xfce_create_header, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "create_header_with_image", (PyCFunction)_wrap_xfce_create_header_with_image, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "create_small_label", (PyCFunction)_wrap_xfce_create_small_label, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "create_mixed_button", (PyCFunction)_wrap_xfce_create_mixed_button, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -232,48 +141,42 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
+ _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
+ _PyGdkPixbuf_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Pixbuf");
if (_PyGdkPixbuf_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Pixbuf from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 279 "dialogs.c"
+#line 182 "dialogs.c"
}
Modified: pyxfce/branches/4.6/gui/filechooser.c
===================================================================
--- pyxfce/branches/4.6/gui/filechooser.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/filechooser.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -28,8 +28,8 @@
/* ----------- functions ----------- */
-PyMethodDef pyfilechooser_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pyfilechooser_functions[] = {
+ { NULL, NULL, 0, NULL }
};
@@ -38,6 +38,9 @@
void
pyfilechooser_add_constants(PyObject *module, const gchar *strip_prefix)
{
+#ifdef VERSION
+ PyModule_AddStringConstant(module, "__version__", VERSION);
+#endif
pyg_enum_add(module, "FileChooserAction", strip_prefix, XFCE_TYPE_FILE_CHOOSER_ACTION);
if (PyErr_Occurred())
@@ -51,20 +54,18 @@
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 ;
}
-#line 70 "filechooser.c"
+#line 71 "filechooser.c"
}
Modified: pyxfce/branches/4.6/gui/framebox.c
===================================================================
--- pyxfce/branches/4.6/gui/framebox.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/framebox.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -26,7 +26,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceFramebox_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceFramebox_Type;
#line 32 "framebox.c"
@@ -41,7 +41,7 @@
char *text;
int indent;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si:XfceFramebox.__init__", kwlist, &text, &indent))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:XfceFramebox.__init__", kwlist, &text, &indent))
return -1;
self->obj = (GObject *)xfce_framebox_new(text, indent);
@@ -59,57 +59,60 @@
static char *kwlist[] = { "widget", NULL };
PyGObject *widget;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceFramebox.add", kwlist, &PyGtkWidget_Type, &widget))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceFramebox.add", kwlist, &PyGtkWidget_Type, &widget))
return NULL;
+
xfce_framebox_add(XFCE_FRAMEBOX(self->obj), GTK_WIDGET(widget->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
-static PyMethodDef _PyXfceFramebox_methods[] = {
- { "add", (PyCFunction)_wrap_xfce_framebox_add, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceFramebox_methods[] = {
+ { "add", (PyCFunction)_wrap_xfce_framebox_add, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceFramebox_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceFramebox_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "framebox.Framebox", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "framebox.Framebox", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceFramebox_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceFramebox_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_framebox_new, /* tp_init */
+ (initproc)_wrap_xfce_framebox_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -120,8 +123,8 @@
/* ----------- functions ----------- */
-PyMethodDef pyframebox_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pyframebox_functions[] = {
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -131,41 +134,37 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkFrame_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Frame");
+ _PyGtkFrame_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Frame");
if (_PyGtkFrame_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Frame from gtk");
- return;
+ return ;
}
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
+ _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 170 "framebox.c"
+#line 169 "framebox.c"
pygobject_register_class(d, "XfceFramebox", XFCE_TYPE_FRAMEBOX, &PyXfceFramebox_Type, Py_BuildValue("(O)", &PyGtkFrame_Type));
}
Modified: pyxfce/branches/4.6/gui/gdk_extensions.c
===================================================================
--- pyxfce/branches/4.6/gui/gdk_extensions.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/gdk_extensions.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -39,9 +39,11 @@
PyGObject *display;
gchar *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:gdk_display_get_fullname", kwlist, &PyGdkDisplay_Type, &display))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:gdk_display_get_fullname", kwlist, &PyGdkDisplay_Type, &display))
return NULL;
+
ret = xfce_gdk_display_get_fullname(GDK_DISPLAY(display->obj));
+
if (ret) {
PyObject *py_ret = PyString_FromString(ret);
g_free(ret);
@@ -58,9 +60,11 @@
PyGObject *screen;
gchar *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:gdk_screen_get_fullname", kwlist, &PyGdkScreen_Type, &screen))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:gdk_screen_get_fullname", kwlist, &PyGdkScreen_Type, &screen))
return NULL;
+
ret = xfce_gdk_screen_get_fullname(GDK_SCREEN(screen->obj));
+
if (ret) {
PyObject *py_ret = PyString_FromString(ret);
g_free(ret);
@@ -79,20 +83,25 @@
int ret;
GError *error = NULL;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:gdk_spawn_command_line_on_screen", kwlist, &PyGdkScreen_Type, &screen, &command_line))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!s:gdk_spawn_command_line_on_screen", kwlist, &PyGdkScreen_Type, &screen, &command_line))
return NULL;
+
ret = xfce_gdk_spawn_command_line_on_screen(GDK_SCREEN(screen->obj), command_line, &error);
+
if (pyg_error_check(&error))
return NULL;
return PyBool_FromLong(ret);
}
-PyMethodDef pygdk_extensions_functions[] = {
- { "gdk_display_get_fullname", (PyCFunction)_wrap_xfce_gdk_display_get_fullname, METH_VARARGS|METH_KEYWORDS },
- { "gdk_screen_get_fullname", (PyCFunction)_wrap_xfce_gdk_screen_get_fullname, METH_VARARGS|METH_KEYWORDS },
- { "gdk_spawn_command_line_on_screen", (PyCFunction)_wrap_xfce_gdk_spawn_command_line_on_screen, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pygdk_extensions_functions[] = {
+ { "gdk_display_get_fullname", (PyCFunction)_wrap_xfce_gdk_display_get_fullname, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "gdk_screen_get_fullname", (PyCFunction)_wrap_xfce_gdk_screen_get_fullname, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "gdk_spawn_command_line_on_screen", (PyCFunction)_wrap_xfce_gdk_spawn_command_line_on_screen, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -102,40 +111,36 @@
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.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkDisplay_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Display");
+ _PyGdkDisplay_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Display");
if (_PyGdkDisplay_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Display from gtk.gdk");
- return;
+ return ;
}
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
+ _PyGdkScreen_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Screen");
if (_PyGdkScreen_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Screen from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 141 "gdk_extensions.c"
+#line 146 "gdk_extensions.c"
}
Modified: pyxfce/branches/4.6/gui/gtk_extensions.c
===================================================================
--- pyxfce/branches/4.6/gui/gtk_extensions.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/gtk_extensions.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -36,9 +36,11 @@
PyGObject *window, *screen;
int monitor;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O!i:gtk_window_center_on_monitor", kwlist, &PyGtkWindow_Type, &window, &PyGdkScreen_Type, &screen, &monitor))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!O!i:gtk_window_center_on_monitor", kwlist, &PyGtkWindow_Type, &window, &PyGdkScreen_Type, &screen, &monitor))
return NULL;
+
xfce_gtk_window_center_on_monitor(GTK_WINDOW(window->obj), GDK_SCREEN(screen->obj), monitor);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -49,17 +51,21 @@
static char *kwlist[] = { "window", NULL };
PyGObject *window;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:gtk_window_center_on_monitor_with_pointer", kwlist, &PyGtkWindow_Type, &window))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:gtk_window_center_on_monitor_with_pointer", kwlist, &PyGtkWindow_Type, &window))
return NULL;
+
xfce_gtk_window_center_on_monitor_with_pointer(GTK_WINDOW(window->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
-PyMethodDef pygtk_extensions_functions[] = {
- { "gtk_window_center_on_monitor", (PyCFunction)_wrap_xfce_gtk_window_center_on_monitor, METH_VARARGS|METH_KEYWORDS },
- { "gtk_window_center_on_monitor_with_pointer", (PyCFunction)_wrap_xfce_gtk_window_center_on_monitor_with_pointer, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pygtk_extensions_functions[] = {
+ { "gtk_window_center_on_monitor", (PyCFunction)_wrap_xfce_gtk_window_center_on_monitor, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "gtk_window_center_on_monitor_with_pointer", (PyCFunction)_wrap_xfce_gtk_window_center_on_monitor_with_pointer, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -69,46 +75,40 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWindow_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Window");
+ _PyGtkWindow_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Window");
if (_PyGtkWindow_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Window from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
+ _PyGdkScreen_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Screen");
if (_PyGdkScreen_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Screen from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
Modified: pyxfce/branches/4.6/gui/gtk_style.c
===================================================================
--- pyxfce/branches/4.6/gui/gtk_style.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/gtk_style.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -35,9 +35,11 @@
char *name, *state;
gchar *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!ss:get_style", kwlist, &PyGtkWidget_Type, &widget, &name, &state))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!ss:get_style", kwlist, &PyGtkWidget_Type, &widget, &name, &state))
return NULL;
+
ret = get_style(GTK_WIDGET(widget->obj), name, state);
+
if (ret) {
PyObject *py_ret = PyString_FromString(ret);
g_free(ret);
@@ -55,17 +57,21 @@
char *state, *style;
GdkGC *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!ss:get_style_gc", kwlist, &PyGtkWidget_Type, &widget, &state, &style))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!ss:get_style_gc", kwlist, &PyGtkWidget_Type, &widget, &state, &style))
return NULL;
+
ret = get_style_gc(GTK_WIDGET(widget->obj), state, style);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-PyMethodDef pygtk_style_functions[] = {
- { "get_style", (PyCFunction)_wrap_get_style, METH_VARARGS|METH_KEYWORDS },
- { "get_style_gc", (PyCFunction)_wrap_get_style_gc, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pygtk_style_functions[] = {
+ { "get_style", (PyCFunction)_wrap_get_style, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_style_gc", (PyCFunction)_wrap_get_style_gc, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -75,34 +81,30 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
+ _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 108 "gtk_style.c"
+#line 110 "gtk_style.c"
}
Modified: pyxfce/branches/4.6/gui/gtktoxevent.c
===================================================================
--- pyxfce/branches/4.6/gui/gtktoxevent.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/gtktoxevent.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -38,9 +38,11 @@
GdkWindow *ret;
long event_mask;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!l:add_event_win", kwlist, &PyGdkScreen_Type, &gscr, &event_mask))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!l:add_event_win", kwlist, &PyGdkScreen_Type, &gscr, &event_mask))
return NULL;
+
ret = xfce_add_event_win(GDK_SCREEN(gscr->obj), event_mask);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -48,7 +50,9 @@
static PyObject *
_wrap_closeEventFilter(PyObject *self)
{
+
closeEventFilter();
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -58,7 +62,9 @@
{
GtkWidget *ret;
+
ret = getDefaultGtkWidget();
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -68,7 +74,9 @@
{
GdkWindow *ret;
+
ret = getGdkEventWindow();
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -78,18 +86,25 @@
{
GdkWindow *ret;
+
ret = getDefaultGdkWindow();
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-PyMethodDef pygtktoxevent_functions[] = {
- { "add_event_win", (PyCFunction)_wrap_xfce_add_event_win, METH_VARARGS|METH_KEYWORDS },
- { "closeEventFilter", (PyCFunction)_wrap_closeEventFilter, METH_NOARGS },
- { "getDefaultGtkWidget", (PyCFunction)_wrap_getDefaultGtkWidget, METH_NOARGS },
- { "getGdkEventWindow", (PyCFunction)_wrap_getGdkEventWindow, METH_NOARGS },
- { "getDefaultGdkWindow", (PyCFunction)_wrap_getDefaultGdkWindow, METH_NOARGS },
- { NULL, NULL, 0 }
+const PyMethodDef pygtktoxevent_functions[] = {
+ { "add_event_win", (PyCFunction)_wrap_xfce_add_event_win, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "closeEventFilter", (PyCFunction)_wrap_closeEventFilter, METH_NOARGS,
+ NULL },
+ { "getDefaultGtkWidget", (PyCFunction)_wrap_getDefaultGtkWidget, METH_NOARGS,
+ NULL },
+ { "getGdkEventWindow", (PyCFunction)_wrap_getGdkEventWindow, METH_NOARGS,
+ NULL },
+ { "getDefaultGdkWindow", (PyCFunction)_wrap_getDefaultGdkWindow, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
@@ -98,6 +113,9 @@
void
pygtktoxevent_add_constants(PyObject *module, const gchar *strip_prefix)
{
+#ifdef VERSION
+ PyModule_AddStringConstant(module, "__version__", VERSION);
+#endif
pyg_enum_add(module, "FilterStatus", strip_prefix, XFCE_TYPE_FILTER_STATUS);
if (PyErr_Occurred())
@@ -111,34 +129,30 @@
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.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
+ _PyGdkScreen_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Screen");
if (_PyGdkScreen_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Screen from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 144 "gtktoxevent.c"
+#line 158 "gtktoxevent.c"
}
Modified: pyxfce/branches/4.6/gui/iconbutton.c
===================================================================
--- pyxfce/branches/4.6/gui/iconbutton.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/iconbutton.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -26,7 +26,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceIconbutton_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceIconbutton_Type;
#line 32 "iconbutton.c"
@@ -39,77 +39,81 @@
{
static char* kwlist[] = { NULL };
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":iconbutton.Iconbutton.__init__", kwlist))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ ":iconbutton.Iconbutton.__init__",
+ kwlist))
return -1;
pygobject_constructv(self, 0, NULL);
-
if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
+ PyErr_SetString(
+ PyExc_RuntimeError,
+ "could not create iconbutton.Iconbutton object");
return -1;
}
-
return 0;
}
-
static PyObject *
_wrap_xfce_iconbutton_set_pixbuf(PyGObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "pixbuf", NULL };
PyGObject *pixbuf;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceIconbutton.set_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceIconbutton.set_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
return NULL;
+
xfce_iconbutton_set_pixbuf(XFCE_ICONBUTTON(self->obj), GDK_PIXBUF(pixbuf->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
-static PyMethodDef _PyXfceIconbutton_methods[] = {
- { "set_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_set_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceIconbutton_methods[] = {
+ { "set_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_set_pixbuf, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceIconbutton_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceIconbutton_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "iconbutton.Iconbutton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "iconbutton.Iconbutton", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceIconbutton_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceIconbutton_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_iconbutton_new, /* tp_init */
+ (initproc)_wrap_xfce_iconbutton_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -127,16 +131,19 @@
PyGObject *pb;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:iconbutton_new_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pb))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:iconbutton_new_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pb))
return NULL;
+
ret = xfce_iconbutton_new_from_pixbuf(GDK_PIXBUF(pb->obj));
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-PyMethodDef pyiconbutton_functions[] = {
- { "iconbutton_new_from_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pyiconbutton_functions[] = {
+ { "iconbutton_new_from_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -146,50 +153,44 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkButton_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Button");
+ _PyGtkButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Button");
if (_PyGtkButton_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Button from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
+ _PyGdkPixbuf_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Pixbuf");
if (_PyGdkPixbuf_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Pixbuf from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 193 "iconbutton.c"
+#line 194 "iconbutton.c"
pygobject_register_class(d, "XfceIconbutton", XFCE_TYPE_ICONBUTTON, &PyXfceIconbutton_Type, Py_BuildValue("(O)", &PyGtkButton_Type));
pyg_set_object_has_new_constructor(XFCE_TYPE_ICONBUTTON);
}
Modified: pyxfce/branches/4.6/gui/icons.c
===================================================================
--- pyxfce/branches/4.6/gui/icons.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/icons.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -37,9 +37,11 @@
int size;
gchar *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si:themed_icon_lookup", kwlist, &name, &size))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:themed_icon_lookup", kwlist, &name, &size))
return NULL;
+
ret = xfce_themed_icon_lookup(name, size);
+
if (ret) {
PyObject *py_ret = PyString_FromString(ret);
g_free(ret);
@@ -57,9 +59,11 @@
int size;
GdkPixbuf *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si:themed_icon_load", kwlist, &name, &size))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:themed_icon_load", kwlist, &name, &size))
return NULL;
+
ret = xfce_themed_icon_load(name, size);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -73,11 +77,13 @@
gchar *ret;
XfceIconThemeCategory category;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi:themed_icon_lookup_category", kwlist, &py_category, &size))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"Oi:themed_icon_lookup_category", kwlist, &py_category, &size))
return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_ICON_THEME_CATEGORY, py_category, (gint *)&category))
+ if (pyg_enum_get_value(XFCE_TYPE_ICON_THEME_CATEGORY, py_category, (gpointer)&category))
return NULL;
+
ret = xfce_themed_icon_lookup_category(category, size);
+
if (ret) {
PyObject *py_ret = PyString_FromString(ret);
g_free(ret);
@@ -96,11 +102,13 @@
GdkPixbuf *ret;
XfceIconThemeCategory category;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi:themed_icon_load_category", kwlist, &py_category, &size))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"Oi:themed_icon_load_category", kwlist, &py_category, &size))
return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_ICON_THEME_CATEGORY, py_category, (gint *)&category))
+ if (pyg_enum_get_value(XFCE_TYPE_ICON_THEME_CATEGORY, py_category, (gpointer)&category))
return NULL;
+
ret = xfce_themed_icon_load_category(category, size);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -111,9 +119,11 @@
static char *kwlist[] = { "path", NULL };
char *path;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:themed_icon_add_search_path", kwlist, &path))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:themed_icon_add_search_path", kwlist, &path))
return NULL;
+
xfce_themed_icon_add_search_path(path);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -124,14 +134,33 @@
static char *kwlist[] = { "theme_name", NULL };
char *theme_name;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:themed_icon_set_icon_theme", kwlist, &theme_name))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:themed_icon_set_icon_theme", kwlist, &theme_name))
return NULL;
+
xfce_set_icon_theme(theme_name);
+
Py_INCREF(Py_None);
return Py_None;
}
static PyObject *
+_wrap_inline_icon_at_size(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "data", "width", "height", NULL };
+ int data_len, width, height;
+ guchar *data;
+ GdkPixbuf *ret;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s#ii:inline_icon_at_size", kwlist, &data, &data_len, &width, &height))
+ return NULL;
+
+ ret = inline_icon_at_size(data, width, height);
+
+ /* pygobject_new handles NULL checking */
+ return pygobject_new((GObject *)ret);
+}
+
+static PyObject *
_wrap_xfce_load_themed_icon(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "name", "size", NULL };
@@ -139,9 +168,11 @@
int size;
GdkPixbuf *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si:load_themed_icon", kwlist, &name, &size))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:load_themed_icon", kwlist, &name, &size))
return NULL;
+
ret = xfce_load_themed_icon(name, size);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -155,25 +186,37 @@
GdkPixbuf *ret;
GError *error = NULL;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sii:pixbuf_new_from_file_at_size", kwlist, &filename, &width, &height))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sii:pixbuf_new_from_file_at_size", kwlist, &filename, &width, &height))
return NULL;
+
ret = xfce_pixbuf_new_from_file_at_size(filename, width, height, &error);
+
if (pyg_error_check(&error))
return NULL;
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-PyMethodDef pyicons_functions[] = {
- { "themed_icon_lookup", (PyCFunction)_wrap_xfce_themed_icon_lookup, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_load", (PyCFunction)_wrap_xfce_themed_icon_load, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_lookup_category", (PyCFunction)_wrap_xfce_themed_icon_lookup_category, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_load_category", (PyCFunction)_wrap_xfce_themed_icon_load_category, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_add_search_path", (PyCFunction)_wrap_xfce_themed_icon_add_search_path, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_set_icon_theme", (PyCFunction)_wrap_xfce_set_icon_theme, METH_VARARGS|METH_KEYWORDS },
- { "load_themed_icon", (PyCFunction)_wrap_xfce_load_themed_icon, METH_VARARGS|METH_KEYWORDS },
- { "pixbuf_new_from_file_at_size", (PyCFunction)_wrap_xfce_pixbuf_new_from_file_at_size, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pyicons_functions[] = {
+ { "themed_icon_lookup", (PyCFunction)_wrap_xfce_themed_icon_lookup, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "themed_icon_load", (PyCFunction)_wrap_xfce_themed_icon_load, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "themed_icon_lookup_category", (PyCFunction)_wrap_xfce_themed_icon_lookup_category, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "themed_icon_load_category", (PyCFunction)_wrap_xfce_themed_icon_load_category, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "themed_icon_add_search_path", (PyCFunction)_wrap_xfce_themed_icon_add_search_path, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "themed_icon_set_icon_theme", (PyCFunction)_wrap_xfce_set_icon_theme, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "inline_icon_at_size", (PyCFunction)_wrap_inline_icon_at_size, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "load_themed_icon", (PyCFunction)_wrap_xfce_load_themed_icon, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "pixbuf_new_from_file_at_size", (PyCFunction)_wrap_xfce_pixbuf_new_from_file_at_size, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
@@ -182,6 +225,9 @@
void
pyicons_add_constants(PyObject *module, const gchar *strip_prefix)
{
+#ifdef VERSION
+ PyModule_AddStringConstant(module, "__version__", VERSION);
+#endif
pyg_enum_add(module, "IconThemeCategory", strip_prefix, XFCE_TYPE_ICON_THEME_CATEGORY);
if (PyErr_Occurred())
@@ -195,34 +241,30 @@
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.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
+ _PyGdkPixbuf_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Pixbuf");
if (_PyGdkPixbuf_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Pixbuf from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 228 "icons.c"
+#line 270 "icons.c"
}
Added: pyxfce/branches/4.6/gui/icontheme.c
===================================================================
--- pyxfce/branches/4.6/gui/icontheme.c (rev 0)
+++ pyxfce/branches/4.6/gui/icontheme.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -0,0 +1,363 @@
+/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
+
+#include <Python.h>
+
+
+
+#line 6 "icontheme.override"
+#include "pygobject.h"
+#include <gtk/gtk.h>
+#include <libxfcegui4/libxfcegui4.h>
+#include <libxfcegui4/gui-enum-types.h>
+
+#define XFCE_TYPE_FILE_CHOOSER_ACTION GUI_TYPE_FILE_CHOOSER_ACTION
+#define XFCE_TYPE_ICON_THEME_CATEGORY GUI_TYPE_ICON_THEME_CATEGORY
+
+#line 17 "icontheme.c"
+
+
+/* ---------- types from other modules ---------- */
+static PyTypeObject *_PyGObject_Type;
+#define PyGObject_Type (*_PyGObject_Type)
+static PyTypeObject *_PyGdkScreen_Type;
+#define PyGdkScreen_Type (*_PyGdkScreen_Type)
+
+
+/* ---------- forward type declarations ---------- */
+PyTypeObject G_GNUC_INTERNAL PyXfceIconTheme_Type;
+
+#line 30 "icontheme.c"
+
+
+
+/* ----------- XfceIconTheme ----------- */
+
+#line 104 "icontheme.override"
+static int
+_wrap_xfce_icon_theme_new(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "screen", NULL };
+ PyGObject *gscreen;
+
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,
+ "O!:XfceIconTheme.__init__",
+ kwlist, &PyGdkScreen_Type, &gscreen))
+ return -1;
+
+ if (!gscreen) {
+ PyErr_SetString(PyExc_RuntimeError, "could not create XfceIconTheme object");
+ return -1;
+ }
+
+ self->obj = (GObject *)xfce_icon_theme_get_for_screen (gscreen->obj);
+
+ if (!self->obj) {
+ PyErr_SetString(PyExc_RuntimeError, "could not create XfceIconTheme object");
+ return -1;
+ }
+ pygobject_register_wrapper((PyObject *)self);
+ return 0;
+}
+#line 62 "icontheme.c"
+
+
+static PyObject *
+_wrap_xfce_icon_theme_lookup(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "icon_name", "icon_size", NULL };
+ char *icon_name;
+ int icon_size;
+ gchar *ret;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:XfceIconTheme.lookup", kwlist, &icon_name, &icon_size))
+ return NULL;
+
+ ret = xfce_icon_theme_lookup(XFCE_ICON_THEME(self->obj), icon_name, icon_size);
+
+ if (ret) {
+ PyObject *py_ret = PyString_FromString(ret);
+ g_free(ret);
+ return py_ret;
+ }
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
+_wrap_xfce_icon_theme_load(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "icon_name", "icon_size", NULL };
+ char *icon_name;
+ int icon_size;
+ GdkPixbuf *ret;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:XfceIconTheme.load", kwlist, &icon_name, &icon_size))
+ return NULL;
+
+ ret = xfce_icon_theme_load(XFCE_ICON_THEME(self->obj), icon_name, icon_size);
+
+ /* pygobject_new handles NULL checking */
+ return pygobject_new((GObject *)ret);
+}
+
+#line 30 "icontheme.override"
+static PyObject *
+_wrap_xfce_icon_theme_get_search_path(PyGObject *self)
+{
+ gint n_items;
+ PyObject *py_tuple;
+ int i;
+ GList *list;
+ GList *item;
+
+ list = xfce_icon_theme_get_search_path(XFCE_ICON_THEME(self->obj));
+ if (list)
+ n_items = g_list_length (list);
+ else
+ n_items = 0;
+
+ py_tuple = PyTuple_New(n_items);
+ item = list;
+ for (i = 0; item != NULL; i++)
+ PyTuple_SetItem(py_tuple, i, PyString_FromString((char *)item->data));
+
+ if (list) {
+ g_list_foreach (list, (GFunc) g_free, NULL);
+ g_list_free (list);
+ }
+
+ return py_tuple;
+}
+#line 132 "icontheme.c"
+
+
+#line 59 "icontheme.override"
+static PyObject *
+_wrap_xfce_icon_theme_set_search_path(PyGObject *self, PyObject *args,
+ PyObject *kwargs)
+{
+ static char *kwlist[] = { "path", NULL };
+ int i, len;
+ PyObject *py_seq;
+ GList *list;
+
+ if (!PyArg_ParseTupleAndKeywords(args,kwargs,
+ "O:XfceIconTheme.set_search_path",
+ kwlist, &py_seq))
+ return NULL;
+
+ if (!PySequence_Check(py_seq) || (len = PySequence_Size(py_seq)) < 0) {
+ PyErr_SetString(PyExc_ValueError,
+ "path should be a sequence of strings");
+ return NULL;
+ }
+
+ list = NULL;
+
+ for (i = 0; i < len; i++) {
+ PyObject *py_path = PySequence_GetItem(py_seq, i);
+ if (!PyString_Check(py_path)) {
+ PyErr_SetString(PyExc_ValueError, "path items must be strings");
+ Py_DECREF(py_path);
+ if (list)
+ g_list_free (list);
+ return NULL;
+ }
+ list = g_list_append (list, PyString_AsString(py_path));
+ Py_DECREF(py_path);
+ }
+
+ xfce_icon_theme_set_search_path(XFCE_ICON_THEME(self->obj), list);
+
+ if (list)
+ g_list_free (list); /* items are not to be freed by me */
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+#line 179 "icontheme.c"
+
+
+static PyObject *
+_wrap_xfce_icon_theme_prepend_search_path(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "search_path", NULL };
+ char *search_path;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceIconTheme.prepend_search_path", kwlist, &search_path))
+ return NULL;
+
+ xfce_icon_theme_prepend_search_path(XFCE_ICON_THEME(self->obj), search_path);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
+_wrap_xfce_icon_theme_append_search_path(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "search_path", NULL };
+ char *search_path;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceIconTheme.append_search_path", kwlist, &search_path))
+ return NULL;
+
+ xfce_icon_theme_append_search_path(XFCE_ICON_THEME(self->obj), search_path);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
+_wrap_xfce_icon_theme_set_use_svg(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "use_svg", NULL };
+ int use_svg;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceIconTheme.set_use_svg", kwlist, &use_svg))
+ return NULL;
+
+ xfce_icon_theme_set_use_svg(XFCE_ICON_THEME(self->obj), use_svg);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
+_wrap_xfce_icon_theme_get_use_svg(PyGObject *self)
+{
+ int ret;
+
+
+ ret = xfce_icon_theme_get_use_svg(XFCE_ICON_THEME(self->obj));
+
+ return PyBool_FromLong(ret);
+
+}
+
+static const PyMethodDef _PyXfceIconTheme_methods[] = {
+ { "lookup", (PyCFunction)_wrap_xfce_icon_theme_lookup, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "load", (PyCFunction)_wrap_xfce_icon_theme_load, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_search_path", (PyCFunction)_wrap_xfce_icon_theme_get_search_path, METH_NOARGS,
+ NULL },
+ { "set_search_path", (PyCFunction)_wrap_xfce_icon_theme_set_search_path, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "prepend_search_path", (PyCFunction)_wrap_xfce_icon_theme_prepend_search_path, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "append_search_path", (PyCFunction)_wrap_xfce_icon_theme_append_search_path, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_use_svg", (PyCFunction)_wrap_xfce_icon_theme_set_use_svg, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_use_svg", (PyCFunction)_wrap_xfce_icon_theme_get_use_svg, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
+};
+
+PyTypeObject G_GNUC_INTERNAL PyXfceIconTheme_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+ "icontheme.IconTheme", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ /* methods */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
+ (PyNumberMethods*)0, /* tp_as_number */
+ (PySequenceMethods*)0, /* tp_as_sequence */
+ (PyMappingMethods*)0, /* tp_as_mapping */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
+ offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceIconTheme_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
+ offsetof(PyGObject, inst_dict), /* tp_dictoffset */
+ (initproc)_wrap_xfce_icon_theme_new, /* tp_init */
+ (allocfunc)0, /* tp_alloc */
+ (newfunc)0, /* tp_new */
+ (freefunc)0, /* tp_free */
+ (inquiry)0 /* tp_is_gc */
+};
+
+
+
+/* ----------- functions ----------- */
+
+static PyObject *
+_wrap_xfce_icon_theme_get_for_screen(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "screen", NULL };
+ PyGObject *screen;
+ XfceIconTheme *ret;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:icon_theme_get_for_screen", kwlist, &PyGdkScreen_Type, &screen))
+ return NULL;
+
+ ret = xfce_icon_theme_get_for_screen(GDK_SCREEN(screen->obj));
+
+ /* pygobject_new handles NULL checking */
+ return pygobject_new((GObject *)ret);
+}
+
+const PyMethodDef pyicontheme_functions[] = {
+ { "icon_theme_get_for_screen", (PyCFunction)_wrap_xfce_icon_theme_get_for_screen, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
+};
+
+/* initialise stuff extension classes */
+void
+pyicontheme_register_classes(PyObject *d)
+{
+ PyObject *module;
+
+ if ((module = PyImport_ImportModule("gobject")) != NULL) {
+ _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
+ if (_PyGObject_Type == NULL) {
+ PyErr_SetString(PyExc_ImportError,
+ "cannot import name GObject from gobject");
+ return ;
+ }
+ } else {
+ PyErr_SetString(PyExc_ImportError,
+ "could not import gobject");
+ return ;
+ }
+ if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
+ _PyGdkScreen_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Screen");
+ if (_PyGdkScreen_Type == NULL) {
+ PyErr_SetString(PyExc_ImportError,
+ "cannot import name Screen from gtk.gdk");
+ return ;
+ }
+ } else {
+ PyErr_SetString(PyExc_ImportError,
+ "could not import gtk.gdk");
+ return ;
+ }
+
+
+#line 362 "icontheme.c"
+ pygobject_register_class(d, "XfceIconTheme", XFCE_TYPE_ICON_THEME, &PyXfceIconTheme_Type, Py_BuildValue("(O)", &PyGObject_Type));
+}
Modified: pyxfce/branches/4.6/gui/menubutton.c
===================================================================
--- pyxfce/branches/4.6/gui/menubutton.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/menubutton.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -26,7 +26,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceMenubutton_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceMenubutton_Type;
#line 32 "menubutton.c"
@@ -40,7 +40,7 @@
static char *kwlist[] = { "text", NULL };
char *text;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceMenubutton.__init__", kwlist, &text))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceMenubutton.__init__", kwlist, &text))
return -1;
self->obj = (GObject *)xfce_menubutton_new(text);
@@ -58,9 +58,11 @@
static char *kwlist[] = { "text", NULL };
char *text;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceMenubutton.set_text", kwlist, &text))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceMenubutton.set_text", kwlist, &text))
return NULL;
+
xfce_menubutton_set_text(XFCE_MENUBUTTON(self->obj), text);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -71,9 +73,11 @@
static char *kwlist[] = { "pixbuf", NULL };
PyGObject *pixbuf;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceMenubutton.set_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceMenubutton.set_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
return NULL;
+
xfce_menubutton_set_pixbuf(XFCE_MENUBUTTON(self->obj), GDK_PIXBUF(pixbuf->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -84,59 +88,64 @@
static char *kwlist[] = { "stock", NULL };
char *stock;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceMenubutton.set_stock_icon", kwlist, &stock))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceMenubutton.set_stock_icon", kwlist, &stock))
return NULL;
+
xfce_menubutton_set_stock_icon(XFCE_MENUBUTTON(self->obj), stock);
+
Py_INCREF(Py_None);
return Py_None;
}
-static PyMethodDef _PyXfceMenubutton_methods[] = {
- { "set_text", (PyCFunction)_wrap_xfce_menubutton_set_text, METH_VARARGS|METH_KEYWORDS },
- { "set_pixbuf", (PyCFunction)_wrap_xfce_menubutton_set_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { "set_stock_icon", (PyCFunction)_wrap_xfce_menubutton_set_stock_icon, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceMenubutton_methods[] = {
+ { "set_text", (PyCFunction)_wrap_xfce_menubutton_set_text, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_pixbuf", (PyCFunction)_wrap_xfce_menubutton_set_pixbuf, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "set_stock_icon", (PyCFunction)_wrap_xfce_menubutton_set_stock_icon, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceMenubutton_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceMenubutton_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "menubutton.Menubutton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "menubutton.Menubutton", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceMenubutton_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceMenubutton_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_menubutton_new, /* tp_init */
+ (initproc)_wrap_xfce_menubutton_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -155,9 +164,11 @@
PyGObject *pb;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO!:menubutton_new_with_pixbuf", kwlist, &text, &PyGdkPixbuf_Type, &pb))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sO!:menubutton_new_with_pixbuf", kwlist, &text, &PyGdkPixbuf_Type, &pb))
return NULL;
+
ret = xfce_menubutton_new_with_pixbuf(text, GDK_PIXBUF(pb->obj));
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
@@ -169,17 +180,21 @@
char *text, *stock;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss:menubutton_new_with_stock_icon", kwlist, &text, &stock))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ss:menubutton_new_with_stock_icon", kwlist, &text, &stock))
return NULL;
+
ret = xfce_menubutton_new_with_stock_icon(text, stock);
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-PyMethodDef pymenubutton_functions[] = {
- { "menubutton_new_with_pixbuf", (PyCFunction)_wrap_xfce_menubutton_new_with_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { "menubutton_new_with_stock_icon", (PyCFunction)_wrap_xfce_menubutton_new_with_stock_icon, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pymenubutton_functions[] = {
+ { "menubutton_new_with_pixbuf", (PyCFunction)_wrap_xfce_menubutton_new_with_pixbuf, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "menubutton_new_with_stock_icon", (PyCFunction)_wrap_xfce_menubutton_new_with_stock_icon, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -189,49 +204,43 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkButton_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Button");
+ _PyGtkButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Button");
if (_PyGtkButton_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Button from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
+ _PyGdkPixbuf_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Pixbuf");
if (_PyGdkPixbuf_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Pixbuf from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 236 "menubutton.c"
+#line 245 "menubutton.c"
pygobject_register_class(d, "XfceMenubutton", XFCE_TYPE_MENUBUTTON, &PyXfceMenubutton_Type, Py_BuildValue("(O)", &PyGtkButton_Type));
}
Modified: pyxfce/branches/4.6/gui/movehandler.c
===================================================================
--- pyxfce/branches/4.6/gui/movehandler.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/movehandler.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -24,7 +24,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceMovehandler_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceMovehandler_Type;
#line 30 "movehandler.c"
@@ -38,7 +38,7 @@
static char *kwlist[] = { "window", NULL };
PyGObject *window;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceMovehandler.__init__", kwlist, &PyGtkWidget_Type, &window))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceMovehandler.__init__", kwlist, &PyGtkWidget_Type, &window))
return -1;
self->obj = (GObject *)xfce_movehandler_new(GTK_WIDGET(window->obj));
@@ -50,45 +50,45 @@
return 0;
}
-PyTypeObject PyXfceMovehandler_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceMovehandler_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "movehandler.Movehandler", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "movehandler.Movehandler", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (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 */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_movehandler_new, /* tp_init */
+ (initproc)_wrap_xfce_movehandler_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -99,8 +99,8 @@
/* ----------- functions ----------- */
-PyMethodDef pymovehandler_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pymovehandler_functions[] = {
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -110,35 +110,31 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
+ _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 143 "movehandler.c"
+#line 139 "movehandler.c"
pygobject_register_class(d, "XfceMovehandler", XFCE_TYPE_MOVEHANDLER, &PyXfceMovehandler_Type, Py_BuildValue("(O)", &PyGtkWidget_Type));
}
Modified: pyxfce/branches/4.6/gui/scaled_image.c
===================================================================
--- pyxfce/branches/4.6/gui/scaled_image.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/scaled_image.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -27,7 +27,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceScaledImage_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceScaledImage_Type;
#line 33 "scaled_image.c"
@@ -40,77 +40,81 @@
{
static char* kwlist[] = { NULL };
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":scaledimage.ScaledImage.__init__", kwlist))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ ":scaledimage.ScaledImage.__init__",
+ kwlist))
return -1;
pygobject_constructv(self, 0, NULL);
-
if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
+ PyErr_SetString(
+ PyExc_RuntimeError,
+ "could not create scaledimage.ScaledImage object");
return -1;
}
-
return 0;
}
-
static PyObject *
_wrap_xfce_scaled_image_set_from_pixbuf(PyGObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "pixbuf", NULL };
PyGObject *pixbuf;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceScaledImage.set_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceScaledImage.set_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
return NULL;
+
xfce_scaled_image_set_from_pixbuf(XFCE_SCALED_IMAGE(self->obj), GDK_PIXBUF(pixbuf->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
-static PyMethodDef _PyXfceScaledImage_methods[] = {
- { "set_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_set_from_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceScaledImage_methods[] = {
+ { "set_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_set_from_pixbuf, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceScaledImage_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceScaledImage_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "scaledimage.ScaledImage", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "scaledimage.ScaledImage", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceScaledImage_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceScaledImage_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_scaled_image_new, /* tp_init */
+ (initproc)_wrap_xfce_scaled_image_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -128,16 +132,19 @@
PyGObject *pb;
GtkWidget *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:scaled_image_new_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pb))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:scaled_image_new_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pb))
return NULL;
+
ret = xfce_scaled_image_new_from_pixbuf(GDK_PIXBUF(pb->obj));
+
/* pygobject_new handles NULL checking */
return pygobject_new((GObject *)ret);
}
-PyMethodDef pyscaled_image_functions[] = {
- { "scaled_image_new_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pyscaled_image_functions[] = {
+ { "scaled_image_new_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -147,50 +154,44 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkImage_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Image");
+ _PyGtkImage_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Image");
if (_PyGtkImage_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Image from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
+ _PyGdkPixbuf_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Pixbuf");
if (_PyGdkPixbuf_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Pixbuf from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 194 "scaled_image.c"
+#line 195 "scaled_image.c"
pygobject_register_class(d, "XfceScaledImage", XFCE_TYPE_SCALED_IMAGE, &PyXfceScaledImage_Type, Py_BuildValue("(O)", &PyGtkImage_Type));
pyg_set_object_has_new_constructor(XFCE_TYPE_SCALED_IMAGE);
}
Modified: pyxfce/branches/4.6/gui/session_client.c
===================================================================
--- pyxfce/branches/4.6/gui/session_client.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/session_client.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -30,8 +30,8 @@
/* ----------- functions ----------- */
-PyMethodDef pysession_client_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pysession_client_functions[] = {
+ { NULL, NULL, 0, NULL }
};
@@ -40,6 +40,9 @@
void
pysession_client_add_constants(PyObject *module, const gchar *strip_prefix)
{
+#ifdef VERSION
+ PyModule_AddStringConstant(module, "__version__", VERSION);
+#endif
pyg_enum_add(module, "InteractStyle", strip_prefix, SESSION_TYPE_INTERACT_STYLE);
pyg_enum_add(module, "RestartStyle", strip_prefix, SESSION_TYPE_RESTART_STYLE);
pyg_enum_add(module, "ClientState", strip_prefix, SESSION_TYPE_CLIENT_STATE);
@@ -55,20 +58,18 @@
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 ;
}
-#line 74 "session_client.c"
+#line 75 "session_client.c"
}
Added: pyxfce/branches/4.6/gui/startup-notification.c
===================================================================
--- pyxfce/branches/4.6/gui/startup-notification.c (rev 0)
+++ pyxfce/branches/4.6/gui/startup-notification.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -0,0 +1,109 @@
+/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
+
+#include <Python.h>
+
+
+
+#line 6 "startup-notification.override"
+#include "pygobject.h"
+#include <gtk/gtk.h>
+#include <libxfcegui4/libxfcegui4.h>
+
+#line 13 "startup-notification.c"
+
+
+/* ---------- types from other modules ---------- */
+static PyTypeObject *_PyGObject_Type;
+#define PyGObject_Type (*_PyGObject_Type)
+static PyTypeObject *_PyGdkScreen_Type;
+#define PyGdkScreen_Type (*_PyGdkScreen_Type)
+
+
+/* ---------- forward type declarations ---------- */
+
+#line 25 "startup-notification.c"
+
+
+
+/* ----------- functions ----------- */
+
+#line 26 "startup-notification.override"
+static PyObject *
+_wrap_xfce_startup_notification_start(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "screen", "path", NULL };
+ PyGObject *screen;
+ char *path;
+ gchar *ret;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:startup_notification_start", kwlist, &PyGdkScreen_Type, &screen, &path))
+ return NULL;
+ ret = xfce_startup_notification_start(GDK_SCREEN(screen->obj), path);
+ if (ret) {
+ PyObject *py_ret = PyString_FromString(ret);
+ g_free(ret);
+ return py_ret;
+ }
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+#line 51 "startup-notification.c"
+
+
+static PyObject *
+_wrap_xfce_startup_notification_cancel(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "id", NULL };
+ char *id;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:startup_notification_cancel", kwlist, &id))
+ return NULL;
+
+ xfce_startup_notification_cancel(id);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+const PyMethodDef pystartup_notification_functions[] = {
+ { "startup_notification_start", (PyCFunction)_wrap_xfce_startup_notification_start, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "startup_notification_cancel", (PyCFunction)_wrap_xfce_startup_notification_cancel, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
+};
+
+/* initialise stuff extension classes */
+void
+pystartup_notification_register_classes(PyObject *d)
+{
+ PyObject *module;
+
+ if ((module = PyImport_ImportModule("gobject")) != NULL) {
+ _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
+ if (_PyGObject_Type == NULL) {
+ PyErr_SetString(PyExc_ImportError,
+ "cannot import name GObject from gobject");
+ return ;
+ }
+ } else {
+ PyErr_SetString(PyExc_ImportError,
+ "could not import gobject");
+ return ;
+ }
+ if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
+ _PyGdkScreen_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Screen");
+ if (_PyGdkScreen_Type == NULL) {
+ PyErr_SetString(PyExc_ImportError,
+ "cannot import name Screen from gtk.gdk");
+ return ;
+ }
+ } else {
+ PyErr_SetString(PyExc_ImportError,
+ "could not import gtk.gdk");
+ return ;
+ }
+
+
+#line 109 "startup-notification.c"
+}
Modified: pyxfce/branches/4.6/gui/systemtray.c
===================================================================
--- pyxfce/branches/4.6/gui/systemtray.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/systemtray.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -24,7 +24,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceSystemTray_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceSystemTray_Type;
#line 30 "systemtray.c"
@@ -37,20 +37,21 @@
{
static char* kwlist[] = { NULL };
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":systemtray.SystemTray.__init__", kwlist))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ ":systemtray.SystemTray.__init__",
+ kwlist))
return -1;
pygobject_constructv(self, 0, NULL);
-
if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
+ PyErr_SetString(
+ PyExc_RuntimeError,
+ "could not create systemtray.SystemTray object");
return -1;
}
-
return 0;
}
-
#line 30 "systemtray.override"
static PyObject *
_wrap_xfce_system_tray_register(PyGObject *self, PyObject *args, PyObject *kwargs)
@@ -91,62 +92,66 @@
return PyBool_FromLong(0);
}
}
-#line 95 "systemtray.c"
+#line 96 "systemtray.c"
static PyObject *
_wrap_xfce_system_tray_unregister(PyGObject *self)
{
+
xfce_system_tray_unregister(XFCE_SYSTEM_TRAY(self->obj));
+
Py_INCREF(Py_None);
return Py_None;
}
-static PyMethodDef _PyXfceSystemTray_methods[] = {
- { "register", (PyCFunction)_wrap_xfce_system_tray_register, METH_VARARGS|METH_KEYWORDS },
- { "unregister", (PyCFunction)_wrap_xfce_system_tray_unregister, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceSystemTray_methods[] = {
+ { "register", (PyCFunction)_wrap_xfce_system_tray_register, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "unregister", (PyCFunction)_wrap_xfce_system_tray_unregister, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceSystemTray_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceSystemTray_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "systemtray.SystemTray", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "systemtray.SystemTray", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceSystemTray_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceSystemTray_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_system_tray_new, /* tp_init */
+ (initproc)_wrap_xfce_system_tray_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -194,12 +199,13 @@
return PyBool_FromLong(0);
}
}
-#line 198 "systemtray.c"
+#line 203 "systemtray.c"
-PyMethodDef pysystemtray_functions[] = {
- { "system_tray_check_running", (PyCFunction)_wrap_xfce_system_tray_check_running, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
+const PyMethodDef pysystemtray_functions[] = {
+ { "system_tray_check_running", (PyCFunction)_wrap_xfce_system_tray_check_running, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -209,36 +215,32 @@
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.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
+ _PyGdkScreen_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Screen");
if (_PyGdkScreen_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Screen from gtk.gdk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk.gdk");
- return;
+ return ;
}
-#line 242 "systemtray.c"
+#line 244 "systemtray.c"
pygobject_register_class(d, "XfceSystemTray", XFCE_TYPE_SYSTEM_TRAY, &PyXfceSystemTray_Type, Py_BuildValue("(O)", &PyGObject_Type));
pyg_set_object_has_new_constructor(XFCE_TYPE_SYSTEM_TRAY);
}
Added: pyxfce/branches/4.6/gui/titled_dialog.c
===================================================================
--- pyxfce/branches/4.6/gui/titled_dialog.c (rev 0)
+++ pyxfce/branches/4.6/gui/titled_dialog.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -0,0 +1,263 @@
+/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
+
+#include <Python.h>
+
+
+
+#line 6 "titled_dialog.override"
+#include "pygobject.h"
+#include <gtk/gtk.h>
+#include <libxfcegui4/libxfcegui4.h>
+#include <libxfcegui4/gui-enum-types.h>
+
+#line 14 "titled_dialog.c"
+
+
+/* ---------- types from other modules ---------- */
+static PyTypeObject *_PyGObject_Type;
+#define PyGObject_Type (*_PyGObject_Type)
+static PyTypeObject *_PyGtkDialog_Type;
+#define PyGtkDialog_Type (*_PyGtkDialog_Type)
+static PyTypeObject *_PyGtkWindow_Type;
+#define PyGtkWindow_Type (*_PyGtkWindow_Type)
+
+
+/* ---------- forward type declarations ---------- */
+PyTypeObject G_GNUC_INTERNAL PyXfceTitledDialog_Type;
+
+#line 29 "titled_dialog.c"
+
+
+
+/* ----------- XfceTitledDialog ----------- */
+
+static PyObject *
+_wrap_xfce_titled_dialog_get_subtitle(PyGObject *self)
+{
+ const gchar *ret;
+
+
+ ret = xfce_titled_dialog_get_subtitle(XFCE_TITLED_DIALOG(self->obj));
+
+ if (ret)
+ return PyString_FromString(ret);
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject *
+_wrap_xfce_titled_dialog_set_subtitle(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "subtitle", NULL };
+ char *subtitle;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfceTitledDialog.set_subtitle", kwlist, &subtitle))
+ return NULL;
+
+ xfce_titled_dialog_set_subtitle(XFCE_TITLED_DIALOG(self->obj), subtitle);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static const PyMethodDef _PyXfceTitledDialog_methods[] = {
+ { "get_subtitle", (PyCFunction)_wrap_xfce_titled_dialog_get_subtitle, METH_NOARGS,
+ NULL },
+ { "set_subtitle", (PyCFunction)_wrap_xfce_titled_dialog_set_subtitle, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
+};
+
+PyTypeObject G_GNUC_INTERNAL PyXfceTitledDialog_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+ "titleddialog.TitledDialog", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ /* methods */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
+ (PyNumberMethods*)0, /* tp_as_number */
+ (PySequenceMethods*)0, /* tp_as_sequence */
+ (PyMappingMethods*)0, /* tp_as_mapping */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
+ offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceTitledDialog_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
+ offsetof(PyGObject, inst_dict), /* tp_dictoffset */
+ (initproc)0, /* tp_init */
+ (allocfunc)0, /* tp_alloc */
+ (newfunc)0, /* tp_new */
+ (freefunc)0, /* tp_free */
+ (inquiry)0 /* tp_is_gc */
+};
+
+
+
+/* ----------- functions ----------- */
+
+#line 29 "titled_dialog.override"
+static int
+_wrap_xfce_titled_dialog_new_with_buttons(PyGObject *self, PyObject *args,
+ PyObject *kwargs)
+{
+ gchar *title = NULL;
+ PyGObject *py_window = NULL;
+ PyObject *py_flags = NULL, *py_buttons = Py_None;
+ GtkDialogFlags flags = 0;
+ int len, i;
+ GtkWindow *parent;
+
+ static char *kwlist[] = { "title", "parent", "flags", "buttons", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ "|zOOO:XfceTitledDialog.__init__", kwlist,
+ &title, &py_window, &py_flags,
+ &py_buttons))
+ return -1;
+
+ if (py_window == NULL || (PyObject*)py_window == Py_None)
+ parent = NULL;
+ else if (pygobject_check(py_window, &PyGtkWindow_Type))
+ parent = GTK_WINDOW(py_window->obj);
+ else {
+ PyErr_SetString(PyExc_TypeError, "parent must be a GtkWindow or None");
+ return -1;
+ }
+
+ if (pyg_flags_get_value(GTK_TYPE_DIALOG_FLAGS, py_flags, (gint *)&flags))
+ return -1;
+ if (py_buttons == Py_None)
+ len = 0;
+ else if (PyTuple_Check(py_buttons))
+ len = PyTuple_Size(py_buttons);
+ else {
+ PyErr_SetString(PyExc_TypeError, "buttons must be a tuple containing text/response pairs or None");
+ return -1;
+ }
+
+ if (len % 2) {
+ PyErr_SetString(PyExc_RuntimeError,
+ "buttons tuple must contain text/response id pairs");
+ return -1;
+ }
+
+ if (pygobject_constructv(self, 0, NULL)) {
+ PyErr_SetString(PyExc_RuntimeError,
+ "could not create GtkDialog object");
+ return -1;
+ }
+
+ if (title)
+ gtk_window_set_title (GTK_WINDOW (self->obj), title);
+
+ if (parent)
+ gtk_window_set_transient_for (GTK_WINDOW (self->obj), parent);
+
+ if (flags & GTK_DIALOG_MODAL)
+ gtk_window_set_modal (GTK_WINDOW (self->obj), TRUE);
+
+ if (flags & GTK_DIALOG_DESTROY_WITH_PARENT)
+ gtk_window_set_destroy_with_parent (GTK_WINDOW (self->obj), TRUE);
+
+ if (flags & GTK_DIALOG_NO_SEPARATOR)
+ gtk_dialog_set_has_separator (GTK_DIALOG (self->obj), FALSE);
+
+ for (i = 0; i < len; i += 2) {
+ PyObject *text = PyTuple_GetItem(py_buttons, i);
+ PyObject *id = PyTuple_GetItem(py_buttons, i + 1);
+ if (!PyString_Check(text)) {
+ gtk_object_destroy(GTK_OBJECT(self->obj));
+ self->obj = NULL;
+ PyErr_SetString(PyExc_RuntimeError,
+ "first member of each text/response id pair "
+ "must be a string");
+ return -1;
+ }
+ if (!PyInt_Check(id)) {
+ gtk_object_destroy(GTK_OBJECT(self->obj));
+ self->obj = NULL;
+ PyErr_SetString(PyExc_RuntimeError,
+ "second member of each text/response id pair "
+ "must be a number");
+ return -1;
+ }
+ gtk_dialog_add_button(GTK_DIALOG(self->obj), PyString_AsString(text),
+ PyInt_AsLong(id));
+ }
+
+ g_object_ref(self->obj);
+
+ return 0;
+}
+#line 215 "titled_dialog.c"
+
+
+const PyMethodDef pytitled_dialog_functions[] = {
+ { "titled_dialog_new_with_buttons", (PyCFunction)_wrap_xfce_titled_dialog_new_with_buttons, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
+};
+
+/* initialise stuff extension classes */
+void
+pytitled_dialog_register_classes(PyObject *d)
+{
+ PyObject *module;
+
+ if ((module = PyImport_ImportModule("gobject")) != NULL) {
+ _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
+ if (_PyGObject_Type == NULL) {
+ PyErr_SetString(PyExc_ImportError,
+ "cannot import name GObject from gobject");
+ return ;
+ }
+ } else {
+ PyErr_SetString(PyExc_ImportError,
+ "could not import gobject");
+ return ;
+ }
+ if ((module = PyImport_ImportModule("gtk")) != NULL) {
+ _PyGtkDialog_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Dialog");
+ if (_PyGtkDialog_Type == NULL) {
+ PyErr_SetString(PyExc_ImportError,
+ "cannot import name Dialog from gtk");
+ return ;
+ }
+ _PyGtkWindow_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Window");
+ if (_PyGtkWindow_Type == NULL) {
+ PyErr_SetString(PyExc_ImportError,
+ "cannot import name Window from gtk");
+ return ;
+ }
+ } else {
+ PyErr_SetString(PyExc_ImportError,
+ "could not import gtk");
+ return ;
+ }
+
+
+#line 262 "titled_dialog.c"
+ pygobject_register_class(d, "XfceTitledDialog", XFCE_TYPE_TITLED_DIALOG, &PyXfceTitledDialog_Type, Py_BuildValue("(O)", &PyGtkDialog_Type));
+}
Modified: pyxfce/branches/4.6/gui/togglebutton.c
===================================================================
--- pyxfce/branches/4.6/gui/togglebutton.c 2009-07-02 22:28:12 UTC (rev 30175)
+++ pyxfce/branches/4.6/gui/togglebutton.c 2009-07-02 22:29:54 UTC (rev 30176)
@@ -24,7 +24,7 @@
/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceTogglebutton_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceTogglebutton_Type;
#line 30 "togglebutton.c"
@@ -39,9 +39,9 @@
PyObject *py_arrow_type = NULL;
GtkArrowType arrow_type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceTogglebutton.__init__", kwlist, &py_arrow_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceTogglebutton.__init__", kwlist, &py_arrow_type))
return -1;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gint *)&arrow_type))
+ if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gpointer)&arrow_type))
return -1;
self->obj = (GObject *)xfce_togglebutton_new(arrow_type);
@@ -60,11 +60,13 @@
PyObject *py_arrow_type = NULL;
GtkArrowType arrow_type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceTogglebutton.set_arrow_type", kwlist, &py_arrow_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceTogglebutton.set_arrow_type", kwlist, &py_arrow_type))
return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gint *)&arrow_type))
+ if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gpointer)&arrow_type))
return NULL;
+
xfce_togglebutton_set_arrow_type(XFCE_TOGGLEBUTTON(self->obj), arrow_type);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -74,55 +76,59 @@
{
gint ret;
+
ret = xfce_togglebutton_get_arrow_type(XFCE_TOGGLEBUTTON(self->obj));
+
return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
}
-static PyMethodDef _PyXfceTogglebutton_methods[] = {
- { "set_arrow_type", (PyCFunction)_wrap_xfce_togglebutton_set_arrow_type, METH_VARARGS|METH_KEYWORDS },
- { "get_arrow_type", (PyCFunction)_wrap_xfce_togglebutton_get_arrow_type, METH_NOARGS },
- { NULL, NULL, 0 }
+static const PyMethodDef _PyXfceTogglebutton_methods[] = {
+ { "set_arrow_type", (PyCFunction)_wrap_xfce_togglebutton_set_arrow_type, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { "get_arrow_type", (PyCFunction)_wrap_xfce_togglebutton_get_arrow_type, METH_NOARGS,
+ NULL },
+ { NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceTogglebutton_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceTogglebutton_Type = {
PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "togglebutton.Togglebutton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
+ 0, /* ob_size */
+ "togglebutton.Togglebutton", /* tp_name */
+ sizeof(PyGObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
/* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
+ (destructor)0, /* tp_dealloc */
+ (printfunc)0, /* tp_print */
+ (getattrfunc)0, /* tp_getattr */
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)0, /* tp_compare */
+ (reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)0, /* tp_str */
+ (getattrofunc)0, /* tp_getattro */
+ (setattrofunc)0, /* tp_setattro */
+ (PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
+ NULL, /* Documentation string */
+ (traverseproc)0, /* tp_traverse */
+ (inquiry)0, /* tp_clear */
+ (richcmpfunc)0, /* tp_richcompare */
offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceTogglebutton_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
+ (getiterfunc)0, /* tp_iter */
+ (iternextfunc)0, /* tp_iternext */
+ (struct PyMethodDef*)_PyXfceTogglebutton_methods, /* tp_methods */
+ (struct PyMemberDef*)0, /* tp_members */
+ (struct PyGetSetDef*)0, /* tp_getset */
+ NULL, /* tp_base */
+ NULL, /* tp_dict */
+ (descrgetfunc)0, /* tp_descr_get */
+ (descrsetfunc)0, /* tp_descr_set */
offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_togglebutton_new, /* tp_init */
+ (initproc)_wrap_xfce_togglebutton_new, /* tp_init */
(allocfunc)0, /* tp_alloc */
(newfunc)0, /* tp_new */
(freefunc)0, /* tp_free */
@@ -133,8 +139,8 @@
/* ----------- functions ----------- */
-PyMethodDef pytogglebutton_functions[] = {
- { NULL, NULL, 0 }
+const PyMethodDef pytogglebutton_functions[] = {
+ { NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -144,35 +150,31 @@
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")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkToggleButton_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "ToggleButton");
+ _PyGtkToggleButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "ToggleButton");
if (_PyGtkToggleButton_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name ToggleButton from gtk");
- return;
+ return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
- return;
+ return ;
}
-#line 177 "togglebutton.c"
+#line 179 "togglebutton.c"
pygobject_register_class(d, "XfceTogglebutton", XFCE_TYPE_TOGGLEBUTTON, &PyXfceTogglebutton_Type, Py_BuildValue("(O)", &PyGtkToggleButton_Type));
}
More information about the Xfce4-commits
mailing list