Index: mcs/gen-xfce_mcs-channel.c =================================================================== --- mcs/gen-xfce_mcs-channel.c (revision 15848) +++ mcs/gen-xfce_mcs-channel.c (working copy) @@ -299,68 +299,74 @@ } static PyMethodDef _PyXfceMcsChannel_methods[] = { - { "get_channel_name", (PyCFunction)_wrap_xfce_mcs_channel_get_channel_name, METH_NOARGS }, - { "setting_changed", (PyCFunction)_wrap_xfce_mcs_channel_setting_changed, METH_VARARGS|METH_KEYWORDS }, - { "setting_deleted", (PyCFunction)_wrap_xfce_mcs_channel_setting_deleted, METH_VARARGS|METH_KEYWORDS }, - { "setting_added", (PyCFunction)_wrap_xfce_mcs_channel_setting_added, METH_VARARGS|METH_KEYWORDS }, - { "get_setting", (PyCFunction)_wrap_xfce_mcs_channel_get_setting, METH_VARARGS|METH_KEYWORDS }, - { "get_setting_string", (PyCFunction)_wrap_xfce_mcs_channel_get_setting_string, METH_VARARGS|METH_KEYWORDS }, - { "get_setting_color", (PyCFunction)_wrap_xfce_mcs_channel_get_setting_color, METH_VARARGS|METH_KEYWORDS }, - { "get_setting_int", (PyCFunction)_wrap_xfce_mcs_channel_get_setting_int, METH_VARARGS|METH_KEYWORDS }, - { "set_setting", (PyCFunction)_wrap_xfce_mcs_channel_set_setting, METH_VARARGS|METH_KEYWORDS }, - { "set_setting_string", (PyCFunction)_wrap_xfce_mcs_channel_set_setting_string, METH_VARARGS|METH_KEYWORDS }, - { "set_setting_int", (PyCFunction)_wrap_xfce_mcs_channel_set_setting_int, METH_VARARGS|METH_KEYWORDS }, - { "set_setting_color", (PyCFunction)_wrap_xfce_mcs_channel_set_setting_color, METH_VARARGS|METH_KEYWORDS }, - { "delete_setting", (PyCFunction)_wrap_xfce_mcs_channel_delete_setting, METH_VARARGS|METH_KEYWORDS }, - { "delete", (PyCFunction)_wrap_xfce_mcs_channel_delete, METH_NOARGS }, - { "add_channel_from_file", (PyCFunction)_wrap_xfce_mcs_channel_add_channel_from_file, METH_VARARGS|METH_KEYWORDS }, - { "save_channel_to_file", (PyCFunction)_wrap_xfce_mcs_channel_save_channel_to_file, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "get_channel_name", (PyCFunction)_wrap_xfce_mcs_channel_get_channel_name, METH_NOARGS, NULL }, + { "setting_changed", (PyCFunction)_wrap_xfce_mcs_channel_setting_changed, METH_VARARGS|METH_KEYWORDS, NULL }, + { "setting_deleted", (PyCFunction)_wrap_xfce_mcs_channel_setting_deleted, METH_VARARGS|METH_KEYWORDS, NULL }, + { "setting_added", (PyCFunction)_wrap_xfce_mcs_channel_setting_added, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_setting", (PyCFunction)_wrap_xfce_mcs_channel_get_setting, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_setting_string", (PyCFunction)_wrap_xfce_mcs_channel_get_setting_string, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_setting_color", (PyCFunction)_wrap_xfce_mcs_channel_get_setting_color, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_setting_int", (PyCFunction)_wrap_xfce_mcs_channel_get_setting_int, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_setting", (PyCFunction)_wrap_xfce_mcs_channel_set_setting, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_setting_string", (PyCFunction)_wrap_xfce_mcs_channel_set_setting_string, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_setting_int", (PyCFunction)_wrap_xfce_mcs_channel_set_setting_int, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_setting_color", (PyCFunction)_wrap_xfce_mcs_channel_set_setting_color, METH_VARARGS|METH_KEYWORDS, NULL }, + { "delete_setting", (PyCFunction)_wrap_xfce_mcs_channel_delete_setting, METH_VARARGS|METH_KEYWORDS, NULL }, + { "delete", (PyCFunction)_wrap_xfce_mcs_channel_delete, METH_NOARGS, NULL }, + { "add_channel_from_file", (PyCFunction)_wrap_xfce_mcs_channel_add_channel_from_file, METH_VARARGS|METH_KEYWORDS, NULL }, + { "save_channel_to_file", (PyCFunction)_wrap_xfce_mcs_channel_save_channel_to_file, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyXfceMcsChannel_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "xfce4.mcs.Channel", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "xfce4.mcs.Channel", /* 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 */ + (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 */ - _PyXfceMcsChannel_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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_mcs_channel_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _PyXfceMcsChannel_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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_mcs_channel_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -368,7 +374,7 @@ /* ----------- functions ----------- */ PyMethodDef pyxfce_mcs_channel_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; Index: mcs/gen-xfce_mcs-manager.c =================================================================== --- mcs/gen-xfce_mcs-manager.c (revision 15848) +++ mcs/gen-xfce_mcs-manager.c (working copy) @@ -62,54 +62,60 @@ } static PyMethodDef _PyXfceMcsManager_methods[] = { - { "register_channel", (PyCFunction)_wrap_xfce_mcs_manager_register_channel, METH_VARARGS|METH_KEYWORDS }, - { "unregister_channel", (PyCFunction)_wrap_xfce_mcs_manager_unregister_channel, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "register_channel", (PyCFunction)_wrap_xfce_mcs_manager_register_channel, METH_VARARGS|METH_KEYWORDS, NULL }, + { "unregister_channel", (PyCFunction)_wrap_xfce_mcs_manager_unregister_channel, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyXfceMcsManager_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "xfce4.mcs.Manager", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "xfce4.mcs.Manager", /* 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 */ + (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 */ - _PyXfceMcsManager_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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)pygobject_no_constructor, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _PyXfceMcsManager_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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)pygobject_no_constructor, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -117,7 +123,7 @@ /* ----------- functions ----------- */ PyMethodDef pyxfce_mcs_manager_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: mcs/gen-xfce_mcs-client.c =================================================================== --- mcs/gen-xfce_mcs-client.c (revision 15848) +++ mcs/gen-xfce_mcs-client.c (working copy) @@ -139,60 +135,66 @@ } static PyMethodDef _PyXfceMcsClient_methods[] = { - { "get_screen", (PyCFunction)_wrap_xfce_mcs_client_get_screen, METH_NOARGS }, - { "set_screen", (PyCFunction)_wrap_xfce_mcs_client_set_screen, METH_VARARGS|METH_KEYWORDS }, - { "manager_reconnected", (PyCFunction)_wrap_xfce_mcs_client_manager_reconnected, METH_NOARGS }, - { "delete_channel", (PyCFunction)_wrap_xfce_mcs_client_delete_channel, METH_VARARGS|METH_KEYWORDS }, - { "register_channel", (PyCFunction)_wrap_xfce_mcs_client_register_channel, METH_VARARGS|METH_KEYWORDS }, - { "unregister_channel", (PyCFunction)_wrap_xfce_mcs_client_unregister_channel, METH_VARARGS|METH_KEYWORDS }, - { "check_manager", (PyCFunction)_wrap_xfce_mcs_client_check_manager, METH_NOARGS }, - { "show_dialog", (PyCFunction)_wrap_xfce_mcs_client_show_dialog, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "get_screen", (PyCFunction)_wrap_xfce_mcs_client_get_screen, METH_NOARGS, NULL }, + { "set_screen", (PyCFunction)_wrap_xfce_mcs_client_set_screen, METH_VARARGS|METH_KEYWORDS, NULL }, + { "manager_reconnected", (PyCFunction)_wrap_xfce_mcs_client_manager_reconnected, METH_NOARGS, NULL }, + { "delete_channel", (PyCFunction)_wrap_xfce_mcs_client_delete_channel, METH_VARARGS|METH_KEYWORDS, NULL }, + { "register_channel", (PyCFunction)_wrap_xfce_mcs_client_register_channel, METH_VARARGS|METH_KEYWORDS, NULL }, + { "unregister_channel", (PyCFunction)_wrap_xfce_mcs_client_unregister_channel, METH_VARARGS|METH_KEYWORDS, NULL }, + { "check_manager", (PyCFunction)_wrap_xfce_mcs_client_check_manager, METH_NOARGS, NULL }, + { "show_dialog", (PyCFunction)_wrap_xfce_mcs_client_show_dialog, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyXfceMcsClient_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "xfce4.mcs.Client", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "xfce4.mcs.Client", /* 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 */ + (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 */ - _PyXfceMcsClient_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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_mcs_client_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _PyXfceMcsClient_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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_mcs_client_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -200,7 +202,7 @@ /* ----------- functions ----------- */ PyMethodDef pyxfce_mcs_client_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: mcs/mcs_common.c =================================================================== --- mcs/mcs_common.c (revision 15848) +++ mcs/mcs_common.c (working copy) @@ -32,8 +32,8 @@ } PyMethodDef pymcs_common_functions[] = { - { "mcs_byte_order", (PyCFunction)_wrap_mcs_byte_order, METH_NOARGS }, - { NULL, NULL, 0 } + { "mcs_byte_order", (PyCFunction)_wrap_mcs_byte_order, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; Index: mcs/mcs_manager.c =================================================================== --- mcs/mcs_manager.c (revision 15848) +++ mcs/mcs_manager.c (working copy) @@ -23,7 +23,7 @@ /* ----------- functions ----------- */ PyMethodDef pymcs_manager_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: mcs/mcs_client.c =================================================================== --- mcs/mcs_client.c (revision 15848) +++ mcs/mcs_client.c (working copy) @@ -23,7 +23,7 @@ /* ----------- functions ----------- */ PyMethodDef pymcs_client_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; Index: gui/gtk_style.c =================================================================== --- gui/gtk_style.c (revision 15848) +++ gui/gtk_style.c (working copy) @@ -60,9 +60,9 @@ } 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 } + { "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 */ Index: gui/icontheme.c =================================================================== --- gui/icontheme.c (revision 15848) +++ gui/icontheme.c (working copy) @@ -278,63 +278,69 @@ } static PyMethodDef _PyXfceIconTheme_methods[] = { - { "lookup", (PyCFunction)_wrap_xfce_icon_theme_lookup, METH_VARARGS|METH_KEYWORDS }, - { "lookup_category", (PyCFunction)_wrap_xfce_icon_theme_lookup_category, METH_VARARGS|METH_KEYWORDS }, - { "load", (PyCFunction)_wrap_xfce_icon_theme_load, METH_VARARGS|METH_KEYWORDS }, - { "load_category", (PyCFunction)_wrap_xfce_icon_theme_load_category, METH_VARARGS|METH_KEYWORDS }, - { "get_search_path", (PyCFunction)_wrap_xfce_icon_theme_get_search_path, METH_NOARGS }, - { "set_search_path", (PyCFunction)_wrap_xfce_icon_theme_set_search_path, METH_VARARGS|METH_KEYWORDS }, - { "prepend_search_path", (PyCFunction)_wrap_xfce_icon_theme_prepend_search_path, METH_VARARGS|METH_KEYWORDS }, - { "append_search_path", (PyCFunction)_wrap_xfce_icon_theme_append_search_path, METH_VARARGS|METH_KEYWORDS }, - { "unregister_category", (PyCFunction)_wrap_xfce_icon_theme_unregister_category, METH_VARARGS|METH_KEYWORDS }, - { "set_use_svg", (PyCFunction)_wrap_xfce_icon_theme_set_use_svg, METH_VARARGS|METH_KEYWORDS }, - { "get_use_svg", (PyCFunction)_wrap_xfce_icon_theme_get_use_svg, METH_NOARGS }, - { NULL, NULL, 0 } + { "lookup", (PyCFunction)_wrap_xfce_icon_theme_lookup, METH_VARARGS|METH_KEYWORDS, NULL }, + { "lookup_category", (PyCFunction)_wrap_xfce_icon_theme_lookup_category, METH_VARARGS|METH_KEYWORDS, NULL }, + { "load", (PyCFunction)_wrap_xfce_icon_theme_load, METH_VARARGS|METH_KEYWORDS, NULL }, + { "load_category", (PyCFunction)_wrap_xfce_icon_theme_load_category, 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 }, + { "unregister_category", (PyCFunction)_wrap_xfce_icon_theme_unregister_category, 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 PyXfceIconTheme_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "icontheme.IconTheme", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 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 */ + (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 */ - _PyXfceIconTheme_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 */ - 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 */ + (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 */ + _PyXfceIconTheme_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 */ + 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 */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -356,8 +362,8 @@ } PyMethodDef pyicontheme_functions[] = { - { "icon_theme_get_for_screen", (PyCFunction)_wrap_xfce_icon_theme_get_for_screen, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "icon_theme_get_for_screen", (PyCFunction)_wrap_xfce_icon_theme_get_for_screen, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; Index: gui/icons.c =================================================================== --- gui/icons.c (revision 15848) +++ gui/icons.c (working copy) @@ -119,13 +119,13 @@ } PyMethodDef pyicons_functions[] = { - { "themed_icon_set_icon_theme", (PyCFunction)_wrap_xfce_set_icon_theme, METH_VARARGS|METH_KEYWORDS }, - { "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_add_search_path", (PyCFunction)_wrap_xfce_themed_icon_add_search_path, METH_VARARGS|METH_KEYWORDS }, - { "pixbuf_new_from_file_at_size", (PyCFunction)_wrap_xfce_pixbuf_new_from_file_at_size, METH_VARARGS|METH_KEYWORDS }, - { "load_themed_icon", (PyCFunction)_wrap_xfce_load_themed_icon, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "themed_icon_set_icon_theme", (PyCFunction)_wrap_xfce_set_icon_theme, METH_VARARGS|METH_KEYWORDS, NULL }, + { "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_add_search_path", (PyCFunction)_wrap_xfce_themed_icon_add_search_path, 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 }, + { "load_themed_icon", (PyCFunction)_wrap_xfce_load_themed_icon, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/gtktoxevent.c =================================================================== --- gui/gtktoxevent.c (revision 15848) +++ gui/gtktoxevent.c (working copy) @@ -81,12 +81,12 @@ } 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 } + { "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 } }; Index: gui/decorbutton.c =================================================================== --- gui/decorbutton.c (revision 15848) +++ gui/decorbutton.c (working copy) @@ -54,47 +54,53 @@ PyTypeObject 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - 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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_decorbutton_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + 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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_decorbutton_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -102,7 +108,7 @@ /* ----------- functions ----------- */ PyMethodDef pydecorbutton_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; Index: gui/menubutton.c =================================================================== --- gui/menubutton.c (revision 15848) +++ gui/menubutton.c (working copy) @@ -89,55 +89,61 @@ } 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 } + { "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 = { 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_menubutton_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_menubutton_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -174,9 +180,9 @@ } 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 } + { "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 */ Index: gui/colorbutton.c =================================================================== --- gui/colorbutton.c (revision 15848) +++ gui/colorbutton.c (working copy) @@ -44,8 +44,8 @@ } PyMethodDef pycolorbutton_functions[] = { - { "color_button_new_with_color", (PyCFunction)_wrap_xfce_color_button_new_with_color, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "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 */ Index: gui/dialogs.c =================================================================== --- gui/dialogs.c (revision 15848) +++ gui/dialogs.c (working copy) @@ -195,19 +195,19 @@ } 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 } + { "show_info", (PyCFunction)_wrap_show_info, METH_VARARGS|METH_KEYWORDS, NULL }, + { "show_warning", (PyCFunction)_wrap_show_warning, METH_VARARGS|METH_KEYWORDS, NULL }, + { "show_error", (PyCFunction)_wrap_show_error, METH_VARARGS|METH_KEYWORDS, NULL }, + { "create_header", (PyCFunction)_wrap_create_header, METH_VARARGS|METH_KEYWORDS, NULL }, + { "create_header_with_image", (PyCFunction)_wrap_create_header_with_image, METH_VARARGS|METH_KEYWORDS, NULL }, + { "small_label", (PyCFunction)_wrap_small_label, METH_VARARGS|METH_KEYWORDS, NULL }, + { "exec_command", (PyCFunction)_wrap_exec_command, METH_VARARGS|METH_KEYWORDS, NULL }, + { "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 */ Index: gui/iconbutton.c =================================================================== --- gui/iconbutton.c (revision 15848) +++ gui/iconbutton.c (working copy) @@ -65,53 +65,59 @@ } static PyMethodDef _PyXfceIconbutton_methods[] = { - { "set_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_set_pixbuf, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "set_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_set_pixbuf, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_iconbutton_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_iconbutton_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -133,8 +139,8 @@ } PyMethodDef pyiconbutton_functions[] = { - { "iconbutton_new_from_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "iconbutton_new_from_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/gdk_extensions.c =================================================================== --- gui/gdk_extensions.c (revision 15848) +++ gui/gdk_extensions.c (working copy) @@ -86,10 +86,10 @@ } 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 } + { "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 */ Index: gui/systemtray.c =================================================================== --- gui/systemtray.c (revision 15848) +++ gui/systemtray.c (working copy) @@ -56,53 +56,59 @@ } static PyMethodDef _PyXfceSystemTray_methods[] = { - { "unregister", (PyCFunction)_wrap_xfce_system_tray_unregister, METH_NOARGS }, - { NULL, NULL, 0 } + { "unregister", (PyCFunction)_wrap_xfce_system_tray_unregister, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_system_tray_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_system_tray_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -110,7 +116,7 @@ /* ----------- functions ----------- */ PyMethodDef pysystemtray_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/aboutdialog.c =================================================================== --- gui/aboutdialog.c (revision 15848) +++ gui/aboutdialog.c (working copy) @@ -210,65 +206,71 @@ } 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 }, - { "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 }, - { NULL, NULL, 0 } + { "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 }, + { "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 }, + { NULL, NULL, 0, NULL } }; PyTypeObject 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_about_dialog_new_empty, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_about_dialog_new_empty, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -276,7 +278,7 @@ /* ----------- functions ----------- */ PyMethodDef pyaboutdialog_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/decortoggle.c =================================================================== --- gui/decortoggle.c (revision 15848) +++ gui/decortoggle.c (working copy) @@ -99,56 +99,62 @@ } 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 } + { "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 = { 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_decortoggle_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_decortoggle_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -156,7 +162,7 @@ /* ----------- functions ----------- */ PyMethodDef pydecortoggle_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/framebox.c =================================================================== --- gui/framebox.c (revision 15848) +++ gui/framebox.c (working copy) @@ -64,53 +64,59 @@ } static PyMethodDef _PyXfceFramebox_methods[] = { - { "add", (PyCFunction)_wrap_xfce_framebox_add, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "add", (PyCFunction)_wrap_xfce_framebox_add, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_framebox_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_framebox_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -118,7 +124,7 @@ /* ----------- functions ----------- */ PyMethodDef pyframebox_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/gtk_extensions.c =================================================================== --- gui/gtk_extensions.c (revision 15848) +++ gui/gtk_extensions.c (working copy) @@ -54,9 +54,9 @@ } 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 } + { "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 */ Index: gui/session_client.c =================================================================== --- gui/session_client.c (revision 15848) +++ gui/session_client.c (working copy) @@ -28,7 +28,7 @@ /* ----------- functions ----------- */ PyMethodDef pysession_client_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; Index: gui/appmenuitem.c =================================================================== --- gui/appmenuitem.c (revision 15848) +++ gui/appmenuitem.c (working copy) @@ -170,62 +170,68 @@ } 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 } + { "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 = { 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_app_menu_item_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_app_menu_item_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -331,14 +337,14 @@ } 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 } + { "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_size", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_size, 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 }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/scaled_image.c =================================================================== --- gui/scaled_image.c (revision 15848) +++ gui/scaled_image.c (working copy) @@ -66,53 +66,59 @@ } static PyMethodDef _PyXfceScaledImage_methods[] = { - { "set_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_set_from_pixbuf, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "set_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_set_from_pixbuf, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_scaled_image_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_scaled_image_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -134,8 +140,8 @@ } PyMethodDef pyscaled_image_functions[] = { - { "scaled_image_new_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "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 */ Index: gui/filechooser.c =================================================================== --- gui/filechooser.c (revision 15848) +++ gui/filechooser.c (working copy) @@ -26,7 +26,7 @@ /* ----------- functions ----------- */ PyMethodDef pyfilechooser_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; Index: gui/movehandler.c =================================================================== --- gui/movehandler.c (revision 15848) +++ gui/movehandler.c (working copy) @@ -49,47 +49,53 @@ PyTypeObject 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - 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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_movehandler_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + 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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_movehandler_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -97,7 +103,7 @@ /* ----------- functions ----------- */ PyMethodDef pymovehandler_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/togglebutton.c =================================================================== --- gui/togglebutton.c (revision 15848) +++ gui/togglebutton.c (working copy) @@ -76,54 +76,60 @@ } 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 } + { "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 = { 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_togglebutton_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_togglebutton_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -131,7 +137,7 @@ /* ----------- functions ----------- */ PyMethodDef pytogglebutton_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: gui/clock.c =================================================================== --- gui/clock.c (revision 15848) +++ gui/clock.c (working copy) @@ -244,70 +244,76 @@ } 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 } + { "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 }, + { "get_mode", (PyCFunction)_wrap_xfce_clock_get_mode, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject 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 */ - (PyNumberMethods*)0, /* tp_as_number */ - (PySequenceMethods*)0, /* tp_as_sequence */ + (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 */ - _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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_xfce_clock_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_xfce_clock_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -315,7 +321,7 @@ /* ----------- functions ----------- */ PyMethodDef pyclock_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; Index: panel/icons.c =================================================================== --- panel/icons.c (revision 15848) +++ panel/icons.c (working copy) @@ -83,11 +83,11 @@ } PyMethodDef pyicons_functions[] = { - { "get_panel_pixbuf", (PyCFunction)_wrap_get_panel_pixbuf, METH_NOARGS }, - { "get_pixbuf_from_file", (PyCFunction)_wrap_get_pixbuf_from_file, METH_VARARGS|METH_KEYWORDS }, - { "get_scaled_pixbuf", (PyCFunction)_wrap_get_scaled_pixbuf, METH_VARARGS|METH_KEYWORDS }, - { "get_themed_pixbuf", (PyCFunction)_wrap_get_themed_pixbuf, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "get_panel_pixbuf", (PyCFunction)_wrap_get_panel_pixbuf, METH_NOARGS, NULL }, + { "get_pixbuf_from_file", (PyCFunction)_wrap_get_pixbuf_from_file, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_scaled_pixbuf", (PyCFunction)_wrap_get_scaled_pixbuf, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_themed_pixbuf", (PyCFunction)_wrap_get_themed_pixbuf, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; Index: panel/support.c =================================================================== --- panel/support.c (revision 15848) +++ panel/support.c (working copy) @@ -47,8 +47,8 @@ } PyMethodDef pysupport_functions[] = { - { "select_file_with_preview", (PyCFunction)_wrap_select_file_with_preview, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "select_file_with_preview", (PyCFunction)_wrap_select_file_with_preview, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/tasklist.c =================================================================== --- netk/tasklist.c (revision 15848) +++ netk/tasklist.c (working copy) @@ -195,63 +195,69 @@ } static PyMethodDef _PyNetkTasklist_methods[] = { - { "set_screen", (PyCFunction)_wrap_netk_tasklist_set_screen, METH_VARARGS|METH_KEYWORDS }, - { "get_size_hint_list", (PyCFunction)_wrap_netk_tasklist_get_size_hint_list, METH_NOARGS }, - { "set_grouping", (PyCFunction)_wrap_netk_tasklist_set_grouping, METH_VARARGS|METH_KEYWORDS }, - { "set_switch_workspace_on_unminimize", (PyCFunction)_wrap_netk_tasklist_set_switch_workspace_on_unminimize, METH_VARARGS|METH_KEYWORDS }, - { "set_grouping_limit", (PyCFunction)_wrap_netk_tasklist_set_grouping_limit, METH_VARARGS|METH_KEYWORDS }, - { "set_include_all_workspaces", (PyCFunction)_wrap_netk_tasklist_set_include_all_workspaces, METH_VARARGS|METH_KEYWORDS }, - { "set_show_label", (PyCFunction)_wrap_netk_tasklist_set_show_label, METH_VARARGS|METH_KEYWORDS }, - { "set_minimum_width", (PyCFunction)_wrap_netk_tasklist_set_minimum_width, METH_VARARGS|METH_KEYWORDS }, - { "get_minimum_width", (PyCFunction)_wrap_netk_tasklist_get_minimum_width, METH_NOARGS }, - { "set_minimum_height", (PyCFunction)_wrap_netk_tasklist_set_minimum_height, METH_VARARGS|METH_KEYWORDS }, - { "get_minimum_height", (PyCFunction)_wrap_netk_tasklist_get_minimum_height, METH_NOARGS }, - { NULL, NULL, 0 } + { "set_screen", (PyCFunction)_wrap_netk_tasklist_set_screen, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_size_hint_list", (PyCFunction)_wrap_netk_tasklist_get_size_hint_list, METH_NOARGS, NULL }, + { "set_grouping", (PyCFunction)_wrap_netk_tasklist_set_grouping, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_switch_workspace_on_unminimize", (PyCFunction)_wrap_netk_tasklist_set_switch_workspace_on_unminimize, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_grouping_limit", (PyCFunction)_wrap_netk_tasklist_set_grouping_limit, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_include_all_workspaces", (PyCFunction)_wrap_netk_tasklist_set_include_all_workspaces, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_show_label", (PyCFunction)_wrap_netk_tasklist_set_show_label, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_minimum_width", (PyCFunction)_wrap_netk_tasklist_set_minimum_width, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_minimum_width", (PyCFunction)_wrap_netk_tasklist_get_minimum_width, METH_NOARGS, NULL }, + { "set_minimum_height", (PyCFunction)_wrap_netk_tasklist_set_minimum_height, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_minimum_height", (PyCFunction)_wrap_netk_tasklist_get_minimum_height, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyNetkTasklist_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "tasklist.Tasklist", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "tasklist.Tasklist", /* 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 */ + (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 */ - _PyNetkTasklist_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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_netk_tasklist_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _PyNetkTasklist_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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_netk_tasklist_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -259,7 +265,7 @@ /* ----------- functions ----------- */ PyMethodDef pytasklist_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; Index: netk/workspace.c =================================================================== --- netk/workspace.c (revision 15848) +++ netk/workspace.c (working copy) @@ -112,61 +112,67 @@ } static PyMethodDef _PyNetkWorkspace_methods[] = { - { "get_number", (PyCFunction)_wrap_netk_workspace_get_number, METH_NOARGS }, - { "get_name", (PyCFunction)_wrap_netk_workspace_get_name, METH_NOARGS }, - { "change_name", (PyCFunction)_wrap_netk_workspace_change_name, METH_VARARGS|METH_KEYWORDS }, - { "activate", (PyCFunction)_wrap_netk_workspace_activate, METH_NOARGS }, - { "get_width", (PyCFunction)_wrap_netk_workspace_get_width, METH_NOARGS }, - { "get_height", (PyCFunction)_wrap_netk_workspace_get_height, METH_NOARGS }, - { "get_viewport_x", (PyCFunction)_wrap_netk_workspace_get_viewport_x, METH_NOARGS }, - { "get_viewport_y", (PyCFunction)_wrap_netk_workspace_get_viewport_y, METH_NOARGS }, - { "is_virtual", (PyCFunction)_wrap_netk_workspace_is_virtual, METH_NOARGS }, - { NULL, NULL, 0 } + { "get_number", (PyCFunction)_wrap_netk_workspace_get_number, METH_NOARGS, NULL }, + { "get_name", (PyCFunction)_wrap_netk_workspace_get_name, METH_NOARGS, NULL }, + { "change_name", (PyCFunction)_wrap_netk_workspace_change_name, METH_VARARGS|METH_KEYWORDS, NULL }, + { "activate", (PyCFunction)_wrap_netk_workspace_activate, METH_NOARGS, NULL }, + { "get_width", (PyCFunction)_wrap_netk_workspace_get_width, METH_NOARGS, NULL }, + { "get_height", (PyCFunction)_wrap_netk_workspace_get_height, METH_NOARGS, NULL }, + { "get_viewport_x", (PyCFunction)_wrap_netk_workspace_get_viewport_x, METH_NOARGS, NULL }, + { "get_viewport_y", (PyCFunction)_wrap_netk_workspace_get_viewport_y, METH_NOARGS, NULL }, + { "is_virtual", (PyCFunction)_wrap_netk_workspace_is_virtual, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyNetkWorkspace_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "workspace.Workspace", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "workspace.Workspace", /* 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 */ + (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 */ - _PyNetkWorkspace_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 */ - 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 */ + (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 */ + _PyNetkWorkspace_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 */ + 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 */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -174,7 +180,7 @@ /* ----------- functions ----------- */ PyMethodDef pyworkspace_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/util.c =================================================================== --- netk/util.c (revision 15848) +++ netk/util.c (working copy) @@ -55,9 +55,9 @@ } PyMethodDef pyutil_functions[] = { - { "gtk_window_set_type", (PyCFunction)_wrap_netk_gtk_window_set_type, METH_VARARGS|METH_KEYWORDS }, - { "gtk_window_avoid_input", (PyCFunction)_wrap_netk_gtk_window_avoid_input, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "gtk_window_set_type", (PyCFunction)_wrap_netk_gtk_window_set_type, METH_VARARGS|METH_KEYWORDS, NULL }, + { "gtk_window_avoid_input", (PyCFunction)_wrap_netk_gtk_window_avoid_input, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/screen.c =================================================================== --- netk/screen.c (revision 15848) +++ netk/screen.c (working copy) @@ -310,70 +310,76 @@ static PyMethodDef _PyNetkScreen_methods[] = { - { "get_workspace", (PyCFunction)_wrap_netk_screen_get_workspace, METH_VARARGS|METH_KEYWORDS }, - { "get_active_workspace", (PyCFunction)_wrap_netk_screen_get_active_workspace, METH_NOARGS }, - { "get_active_window", (PyCFunction)_wrap_netk_screen_get_active_window, METH_NOARGS }, - { "get_windows", (PyCFunction)_wrap_netk_screen_get_windows, METH_NOARGS }, - { "get_windows_stacked", (PyCFunction)_wrap_netk_screen_get_windows_stacked, METH_NOARGS }, - { "force_update", (PyCFunction)_wrap_netk_screen_force_update, METH_NOARGS }, - { "get_workspace_count", (PyCFunction)_wrap_netk_screen_get_workspace_count, METH_NOARGS }, - { "change_workspace_count", (PyCFunction)_wrap_netk_screen_change_workspace_count, METH_VARARGS|METH_KEYWORDS }, - { "net_wm_supports", (PyCFunction)_wrap_netk_screen_net_wm_supports, METH_VARARGS|METH_KEYWORDS }, - { "get_background_pixmap", (PyCFunction)_wrap_netk_screen_get_background_pixmap, METH_NOARGS }, - { "get_width", (PyCFunction)_wrap_netk_screen_get_width, METH_NOARGS }, - { "get_height", (PyCFunction)_wrap_netk_screen_get_height, METH_NOARGS }, - { "get_showing_desktop", (PyCFunction)_wrap_netk_screen_get_showing_desktop, METH_NOARGS }, - { "toggle_showing_desktop", (PyCFunction)_wrap_netk_screen_toggle_showing_desktop, METH_VARARGS|METH_KEYWORDS }, - { "move_viewport", (PyCFunction)_wrap_netk_screen_move_viewport, METH_VARARGS|METH_KEYWORDS }, - { "try_set_workspace_layout", (PyCFunction)_wrap_netk_screen_try_set_workspace_layout, METH_VARARGS|METH_KEYWORDS }, - { "release_workspace_layout", (PyCFunction)_wrap_netk_screen_release_workspace_layout, METH_VARARGS|METH_KEYWORDS }, - { "get_workspaces", (PyCFunction)_wrap_netk_screen_get_workspaces, METH_NOARGS }, - { NULL, NULL, 0 } + { "get_workspace", (PyCFunction)_wrap_netk_screen_get_workspace, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_active_workspace", (PyCFunction)_wrap_netk_screen_get_active_workspace, METH_NOARGS, NULL }, + { "get_active_window", (PyCFunction)_wrap_netk_screen_get_active_window, METH_NOARGS, NULL }, + { "get_windows", (PyCFunction)_wrap_netk_screen_get_windows, METH_NOARGS, NULL }, + { "get_windows_stacked", (PyCFunction)_wrap_netk_screen_get_windows_stacked, METH_NOARGS, NULL }, + { "force_update", (PyCFunction)_wrap_netk_screen_force_update, METH_NOARGS, NULL }, + { "get_workspace_count", (PyCFunction)_wrap_netk_screen_get_workspace_count, METH_NOARGS, NULL }, + { "change_workspace_count", (PyCFunction)_wrap_netk_screen_change_workspace_count, METH_VARARGS|METH_KEYWORDS, NULL }, + { "net_wm_supports", (PyCFunction)_wrap_netk_screen_net_wm_supports, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_background_pixmap", (PyCFunction)_wrap_netk_screen_get_background_pixmap, METH_NOARGS, NULL }, + { "get_width", (PyCFunction)_wrap_netk_screen_get_width, METH_NOARGS, NULL }, + { "get_height", (PyCFunction)_wrap_netk_screen_get_height, METH_NOARGS, NULL }, + { "get_showing_desktop", (PyCFunction)_wrap_netk_screen_get_showing_desktop, METH_NOARGS, NULL }, + { "toggle_showing_desktop", (PyCFunction)_wrap_netk_screen_toggle_showing_desktop, METH_VARARGS|METH_KEYWORDS, NULL }, + { "move_viewport", (PyCFunction)_wrap_netk_screen_move_viewport, METH_VARARGS|METH_KEYWORDS, NULL }, + { "try_set_workspace_layout", (PyCFunction)_wrap_netk_screen_try_set_workspace_layout, METH_VARARGS|METH_KEYWORDS, NULL }, + { "release_workspace_layout", (PyCFunction)_wrap_netk_screen_release_workspace_layout, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_workspaces", (PyCFunction)_wrap_netk_screen_get_workspaces, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyNetkScreen_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "netk.Screen", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "netk.Screen", /* 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 */ + (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 */ - _PyNetkScreen_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 */ - 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 */ + (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 */ + _PyNetkScreen_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 */ + 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 */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -421,10 +427,10 @@ } PyMethodDef pyscreen_functions[] = { - { "screen_get_default", (PyCFunction)_wrap_netk_screen_get_default, METH_NOARGS }, - { "screen_get", (PyCFunction)_wrap_netk_screen_get, METH_VARARGS|METH_KEYWORDS }, - { "screen_get_for_root", (PyCFunction)_wrap_netk_screen_get_for_root, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "screen_get_default", (PyCFunction)_wrap_netk_screen_get_default, METH_NOARGS, NULL }, + { "screen_get", (PyCFunction)_wrap_netk_screen_get, METH_VARARGS|METH_KEYWORDS, NULL }, + { "screen_get_for_root", (PyCFunction)_wrap_netk_screen_get_for_root, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/class_group.c =================================================================== --- netk/class_group.c (revision 15848) +++ netk/class_group.c (working copy) @@ -109,57 +109,63 @@ } static PyMethodDef _PyNetkClassGroup_methods[] = { - { "get_windows", (PyCFunction)_wrap_netk_class_group_get_windows, METH_NOARGS }, - { "get_res_class", (PyCFunction)_wrap_netk_class_group_get_res_class, METH_NOARGS }, - { "get_name", (PyCFunction)_wrap_netk_class_group_get_name, METH_NOARGS }, - { "get_icon", (PyCFunction)_wrap_netk_class_group_get_icon, METH_NOARGS }, - { "get_mini_icon", (PyCFunction)_wrap_netk_class_group_get_mini_icon, METH_NOARGS }, - { NULL, NULL, 0 } + { "get_windows", (PyCFunction)_wrap_netk_class_group_get_windows, METH_NOARGS, NULL }, + { "get_res_class", (PyCFunction)_wrap_netk_class_group_get_res_class, METH_NOARGS, NULL }, + { "get_name", (PyCFunction)_wrap_netk_class_group_get_name, METH_NOARGS, NULL }, + { "get_icon", (PyCFunction)_wrap_netk_class_group_get_icon, METH_NOARGS, NULL }, + { "get_mini_icon", (PyCFunction)_wrap_netk_class_group_get_mini_icon, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyNetkClassGroup_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "classgroup.ClassGroup", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "classgroup.ClassGroup", /* 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 */ + (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 */ - _PyNetkClassGroup_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 */ - 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 */ + (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 */ + _PyNetkClassGroup_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 */ + 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 */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -234,12 +240,12 @@ } PyMethodDef pyclass_group_functions[] = { - { "class_group_get", (PyCFunction)_wrap_netk_class_group_get, METH_VARARGS|METH_KEYWORDS }, - { "p_netk_class_group_create", (PyCFunction)_wrap_p_netk_class_group_create, METH_VARARGS|METH_KEYWORDS }, - { "p_netk_class_group_destroy", (PyCFunction)_wrap_p_netk_class_group_destroy, METH_VARARGS|METH_KEYWORDS }, - { "p_netk_class_group_add_window", (PyCFunction)_wrap_p_netk_class_group_add_window, METH_VARARGS|METH_KEYWORDS }, - { "p_netk_class_group_remove_window", (PyCFunction)_wrap_p_netk_class_group_remove_window, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "class_group_get", (PyCFunction)_wrap_netk_class_group_get, METH_VARARGS|METH_KEYWORDS, NULL }, + { "p_netk_class_group_create", (PyCFunction)_wrap_p_netk_class_group_create, METH_VARARGS|METH_KEYWORDS, NULL }, + { "p_netk_class_group_destroy", (PyCFunction)_wrap_p_netk_class_group_destroy, METH_VARARGS|METH_KEYWORDS, NULL }, + { "p_netk_class_group_add_window", (PyCFunction)_wrap_p_netk_class_group_add_window, METH_VARARGS|METH_KEYWORDS, NULL }, + { "p_netk_class_group_remove_window", (PyCFunction)_wrap_p_netk_class_group_remove_window, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/trayicon.c =================================================================== --- netk/trayicon.c (revision 15848) +++ netk/trayicon.c (working copy) @@ -121,55 +121,61 @@ } static PyMethodDef _PyNetkTrayIcon_methods[] = { - { "set_screen", (PyCFunction)_wrap_netk_tray_icon_set_screen, METH_VARARGS|METH_KEYWORDS }, - { "message_new", (PyCFunction)_wrap_netk_tray_icon_message_new, METH_VARARGS|METH_KEYWORDS }, - { "message_cancel", (PyCFunction)_wrap_netk_tray_icon_message_cancel, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "set_screen", (PyCFunction)_wrap_netk_tray_icon_set_screen, METH_VARARGS|METH_KEYWORDS, NULL }, + { "message_new", (PyCFunction)_wrap_netk_tray_icon_message_new, METH_VARARGS|METH_KEYWORDS, NULL }, + { "message_cancel", (PyCFunction)_wrap_netk_tray_icon_message_cancel, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyNetkTrayIcon_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "trayicon.TrayIcon", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "trayicon.TrayIcon", /* 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 */ + (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 */ - _PyNetkTrayIcon_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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_netk_tray_icon_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _PyNetkTrayIcon_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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_netk_tray_icon_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -177,7 +183,7 @@ /* ----------- functions ----------- */ PyMethodDef pytrayicon_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/window_action_menu.c =================================================================== --- netk/window_action_menu.c (revision 15848) +++ netk/window_action_menu.c (working copy) @@ -41,8 +41,8 @@ } PyMethodDef pywindow_action_menu_functions[] = { - { "create_window_action_menu", (PyCFunction)_wrap_netk_create_window_action_menu, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "create_window_action_menu", (PyCFunction)_wrap_netk_create_window_action_menu, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/window_menu.c =================================================================== --- netk/window_menu.c (revision 15848) +++ netk/window_menu.c (working copy) @@ -23,7 +23,7 @@ /* ----------- functions ----------- */ PyMethodDef pywindow_menu_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/pager.c =================================================================== --- netk/pager.c (revision 15848) +++ netk/pager.c (working copy) @@ -133,58 +133,64 @@ } static PyMethodDef _PyNetkPager_methods[] = { - { "set_screen", (PyCFunction)_wrap_netk_pager_set_screen, METH_VARARGS|METH_KEYWORDS }, - { "set_orientation", (PyCFunction)_wrap_netk_pager_set_orientation, METH_VARARGS|METH_KEYWORDS }, - { "set_n_rows", (PyCFunction)_wrap_netk_pager_set_n_rows, METH_VARARGS|METH_KEYWORDS }, - { "set_display_mode", (PyCFunction)_wrap_netk_pager_set_display_mode, METH_VARARGS|METH_KEYWORDS }, - { "set_show_all", (PyCFunction)_wrap_netk_pager_set_show_all, METH_VARARGS|METH_KEYWORDS }, - { "set_shadow_type", (PyCFunction)_wrap_netk_pager_set_shadow_type, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "set_screen", (PyCFunction)_wrap_netk_pager_set_screen, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_orientation", (PyCFunction)_wrap_netk_pager_set_orientation, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_n_rows", (PyCFunction)_wrap_netk_pager_set_n_rows, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_display_mode", (PyCFunction)_wrap_netk_pager_set_display_mode, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_show_all", (PyCFunction)_wrap_netk_pager_set_show_all, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_shadow_type", (PyCFunction)_wrap_netk_pager_set_shadow_type, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyNetkPager_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "pager.Pager", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "pager.Pager", /* 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 */ + (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 */ - _PyNetkPager_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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)_wrap_netk_pager_new, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _PyNetkPager_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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_netk_pager_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -192,7 +198,7 @@ /* ----------- functions ----------- */ PyMethodDef pypager_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; Index: netk/application.c =================================================================== --- netk/application.c (revision 15848) +++ netk/application.c (working copy) @@ -143,61 +143,67 @@ } static PyMethodDef _PyNetkApplication_methods[] = { - { "get_xid", (PyCFunction)_wrap_netk_application_get_xid, METH_NOARGS }, - { "get_windows", (PyCFunction)_wrap_netk_application_get_windows, METH_NOARGS }, - { "get_n_windows", (PyCFunction)_wrap_netk_application_get_n_windows, METH_NOARGS }, - { "get_name", (PyCFunction)_wrap_netk_application_get_name, METH_NOARGS }, - { "get_icon_name", (PyCFunction)_wrap_netk_application_get_icon_name, METH_NOARGS }, - { "get_pid", (PyCFunction)_wrap_netk_application_get_pid, METH_NOARGS }, - { "get_icon", (PyCFunction)_wrap_netk_application_get_icon, METH_NOARGS }, - { "get_mini_icon", (PyCFunction)_wrap_netk_application_get_mini_icon, METH_NOARGS }, - { "get_icon_is_fallback", (PyCFunction)_wrap_netk_application_get_icon_is_fallback, METH_NOARGS }, - { NULL, NULL, 0 } + { "get_xid", (PyCFunction)_wrap_netk_application_get_xid, METH_NOARGS, NULL }, + { "get_windows", (PyCFunction)_wrap_netk_application_get_windows, METH_NOARGS, NULL }, + { "get_n_windows", (PyCFunction)_wrap_netk_application_get_n_windows, METH_NOARGS, NULL }, + { "get_name", (PyCFunction)_wrap_netk_application_get_name, METH_NOARGS, NULL }, + { "get_icon_name", (PyCFunction)_wrap_netk_application_get_icon_name, METH_NOARGS, NULL }, + { "get_pid", (PyCFunction)_wrap_netk_application_get_pid, METH_NOARGS, NULL }, + { "get_icon", (PyCFunction)_wrap_netk_application_get_icon, METH_NOARGS, NULL }, + { "get_mini_icon", (PyCFunction)_wrap_netk_application_get_mini_icon, METH_NOARGS, NULL }, + { "get_icon_is_fallback", (PyCFunction)_wrap_netk_application_get_icon_is_fallback, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyNetkApplication_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "application.Application", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "application.Application", /* 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 */ + (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 */ - _PyNetkApplication_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 */ - 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 */ + (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 */ + _PyNetkApplication_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 */ + 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 */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -221,8 +227,8 @@ } PyMethodDef pyapplication_functions[] = { - { "application_get", (PyCFunction)_wrap_netk_application_get, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "application_get", (PyCFunction)_wrap_netk_application_get, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: netk/window.c =================================================================== --- netk/window.c (revision 15848) +++ netk/window.c (working copy) @@ -603,109 +603,115 @@ } static PyMethodDef _PyNetkWindow_methods[] = { - { "get_screen", (PyCFunction)_wrap_netk_window_get_screen, METH_NOARGS }, - { "get_name", (PyCFunction)_wrap_netk_window_get_name, METH_NOARGS }, - { "get_icon_name", (PyCFunction)_wrap_netk_window_get_icon_name, METH_NOARGS }, - { "get_application", (PyCFunction)_wrap_netk_window_get_application, METH_NOARGS }, - { "get_group_leader", (PyCFunction)_wrap_netk_window_get_group_leader, METH_NOARGS }, - { "get_xid", (PyCFunction)_wrap_netk_window_get_xid, METH_NOARGS }, - { "get_class_group", (PyCFunction)_wrap_netk_window_get_class_group, METH_NOARGS }, - { "get_session_id", (PyCFunction)_wrap_netk_window_get_session_id, METH_NOARGS }, - { "get_session_id_utf8", (PyCFunction)_wrap_netk_window_get_session_id_utf8, METH_NOARGS }, - { "get_pid", (PyCFunction)_wrap_netk_window_get_pid, METH_NOARGS }, - { "get_client_machine", (PyCFunction)_wrap_netk_window_get_client_machine, METH_NOARGS }, - { "get_window_type", (PyCFunction)_wrap_netk_window_get_window_type, METH_NOARGS }, - { "get_resource_class", (PyCFunction)_wrap_netk_window_get_resource_class, METH_NOARGS }, - { "get_resource_name", (PyCFunction)_wrap_netk_window_get_resource_name, METH_NOARGS }, - { "is_minimized", (PyCFunction)_wrap_netk_window_is_minimized, METH_NOARGS }, - { "is_maximized_horizontally", (PyCFunction)_wrap_netk_window_is_maximized_horizontally, METH_NOARGS }, - { "is_maximized_vertically", (PyCFunction)_wrap_netk_window_is_maximized_vertically, METH_NOARGS }, - { "is_maximized", (PyCFunction)_wrap_netk_window_is_maximized, METH_NOARGS }, - { "is_shaded", (PyCFunction)_wrap_netk_window_is_shaded, METH_NOARGS }, - { "is_skip_pager", (PyCFunction)_wrap_netk_window_is_skip_pager, METH_NOARGS }, - { "is_skip_tasklist", (PyCFunction)_wrap_netk_window_is_skip_tasklist, METH_NOARGS }, - { "is_sticky", (PyCFunction)_wrap_netk_window_is_sticky, METH_NOARGS }, - { "set_skip_pager", (PyCFunction)_wrap_netk_window_set_skip_pager, METH_VARARGS|METH_KEYWORDS }, - { "set_skip_tasklist", (PyCFunction)_wrap_netk_window_set_skip_tasklist, METH_VARARGS|METH_KEYWORDS }, - { "close", (PyCFunction)_wrap_netk_window_close, METH_NOARGS }, - { "minimize", (PyCFunction)_wrap_netk_window_minimize, METH_NOARGS }, - { "unminimize", (PyCFunction)_wrap_netk_window_unminimize, METH_NOARGS }, - { "maximize", (PyCFunction)_wrap_netk_window_maximize, METH_NOARGS }, - { "unmaximize", (PyCFunction)_wrap_netk_window_unmaximize, METH_NOARGS }, - { "maximize_horizontally", (PyCFunction)_wrap_netk_window_maximize_horizontally, METH_NOARGS }, - { "unmaximize_horizontally", (PyCFunction)_wrap_netk_window_unmaximize_horizontally, METH_NOARGS }, - { "maximize_vertically", (PyCFunction)_wrap_netk_window_maximize_vertically, METH_NOARGS }, - { "unmaximize_vertically", (PyCFunction)_wrap_netk_window_unmaximize_vertically, METH_NOARGS }, - { "shade", (PyCFunction)_wrap_netk_window_shade, METH_NOARGS }, - { "unshade", (PyCFunction)_wrap_netk_window_unshade, METH_NOARGS }, - { "stick", (PyCFunction)_wrap_netk_window_stick, METH_NOARGS }, - { "unstick", (PyCFunction)_wrap_netk_window_unstick, METH_NOARGS }, - { "keyboard_move", (PyCFunction)_wrap_netk_window_keyboard_move, METH_NOARGS }, - { "keyboard_size", (PyCFunction)_wrap_netk_window_keyboard_size, METH_NOARGS }, - { "get_workspace", (PyCFunction)_wrap_netk_window_get_workspace, METH_NOARGS }, - { "move_to_workspace", (PyCFunction)_wrap_netk_window_move_to_workspace, METH_VARARGS|METH_KEYWORDS }, - { "is_pinned", (PyCFunction)_wrap_netk_window_is_pinned, METH_NOARGS }, - { "pin", (PyCFunction)_wrap_netk_window_pin, METH_NOARGS }, - { "unpin", (PyCFunction)_wrap_netk_window_unpin, METH_NOARGS }, - { "activate", (PyCFunction)_wrap_netk_window_activate, METH_NOARGS }, - { "is_active", (PyCFunction)_wrap_netk_window_is_active, METH_NOARGS }, - { "activate_transient", (PyCFunction)_wrap_netk_window_activate_transient, METH_NOARGS }, - { "get_icon", (PyCFunction)_wrap_netk_window_get_icon, METH_NOARGS }, - { "get_mini_icon", (PyCFunction)_wrap_netk_window_get_mini_icon, METH_NOARGS }, - { "get_icon_is_fallback", (PyCFunction)_wrap_netk_window_get_icon_is_fallback, METH_NOARGS }, - { "set_icon_geometry", (PyCFunction)_wrap_netk_window_set_icon_geometry, METH_VARARGS|METH_KEYWORDS }, - { "get_actions", (PyCFunction)_wrap_netk_window_get_actions, METH_NOARGS }, - { "get_state", (PyCFunction)_wrap_netk_window_get_state, METH_NOARGS }, - { "get_geometry", (PyCFunction)_wrap_netk_window_get_geometry, METH_NOARGS }, - { "is_visible_on_workspace", (PyCFunction)_wrap_netk_window_is_visible_on_workspace, METH_VARARGS|METH_KEYWORDS }, - { "is_on_workspace", (PyCFunction)_wrap_netk_window_is_on_workspace, METH_VARARGS|METH_KEYWORDS }, - { "is_in_viewport", (PyCFunction)_wrap_netk_window_is_in_viewport, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "get_screen", (PyCFunction)_wrap_netk_window_get_screen, METH_NOARGS, NULL }, + { "get_name", (PyCFunction)_wrap_netk_window_get_name, METH_NOARGS, NULL }, + { "get_icon_name", (PyCFunction)_wrap_netk_window_get_icon_name, METH_NOARGS, NULL }, + { "get_application", (PyCFunction)_wrap_netk_window_get_application, METH_NOARGS, NULL }, + { "get_group_leader", (PyCFunction)_wrap_netk_window_get_group_leader, METH_NOARGS, NULL }, + { "get_xid", (PyCFunction)_wrap_netk_window_get_xid, METH_NOARGS, NULL }, + { "get_class_group", (PyCFunction)_wrap_netk_window_get_class_group, METH_NOARGS, NULL }, + { "get_session_id", (PyCFunction)_wrap_netk_window_get_session_id, METH_NOARGS, NULL }, + { "get_session_id_utf8", (PyCFunction)_wrap_netk_window_get_session_id_utf8, METH_NOARGS, NULL }, + { "get_pid", (PyCFunction)_wrap_netk_window_get_pid, METH_NOARGS, NULL }, + { "get_client_machine", (PyCFunction)_wrap_netk_window_get_client_machine, METH_NOARGS, NULL }, + { "get_window_type", (PyCFunction)_wrap_netk_window_get_window_type, METH_NOARGS, NULL }, + { "get_resource_class", (PyCFunction)_wrap_netk_window_get_resource_class, METH_NOARGS, NULL }, + { "get_resource_name", (PyCFunction)_wrap_netk_window_get_resource_name, METH_NOARGS, NULL }, + { "is_minimized", (PyCFunction)_wrap_netk_window_is_minimized, METH_NOARGS, NULL }, + { "is_maximized_horizontally", (PyCFunction)_wrap_netk_window_is_maximized_horizontally, METH_NOARGS, NULL }, + { "is_maximized_vertically", (PyCFunction)_wrap_netk_window_is_maximized_vertically, METH_NOARGS, NULL }, + { "is_maximized", (PyCFunction)_wrap_netk_window_is_maximized, METH_NOARGS, NULL }, + { "is_shaded", (PyCFunction)_wrap_netk_window_is_shaded, METH_NOARGS, NULL }, + { "is_skip_pager", (PyCFunction)_wrap_netk_window_is_skip_pager, METH_NOARGS, NULL }, + { "is_skip_tasklist", (PyCFunction)_wrap_netk_window_is_skip_tasklist, METH_NOARGS, NULL }, + { "is_sticky", (PyCFunction)_wrap_netk_window_is_sticky, METH_NOARGS, NULL }, + { "set_skip_pager", (PyCFunction)_wrap_netk_window_set_skip_pager, METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_skip_tasklist", (PyCFunction)_wrap_netk_window_set_skip_tasklist, METH_VARARGS|METH_KEYWORDS, NULL }, + { "close", (PyCFunction)_wrap_netk_window_close, METH_NOARGS, NULL }, + { "minimize", (PyCFunction)_wrap_netk_window_minimize, METH_NOARGS, NULL }, + { "unminimize", (PyCFunction)_wrap_netk_window_unminimize, METH_NOARGS, NULL }, + { "maximize", (PyCFunction)_wrap_netk_window_maximize, METH_NOARGS, NULL }, + { "unmaximize", (PyCFunction)_wrap_netk_window_unmaximize, METH_NOARGS, NULL }, + { "maximize_horizontally", (PyCFunction)_wrap_netk_window_maximize_horizontally, METH_NOARGS, NULL }, + { "unmaximize_horizontally", (PyCFunction)_wrap_netk_window_unmaximize_horizontally, METH_NOARGS, NULL }, + { "maximize_vertically", (PyCFunction)_wrap_netk_window_maximize_vertically, METH_NOARGS, NULL }, + { "unmaximize_vertically", (PyCFunction)_wrap_netk_window_unmaximize_vertically, METH_NOARGS, NULL }, + { "shade", (PyCFunction)_wrap_netk_window_shade, METH_NOARGS, NULL }, + { "unshade", (PyCFunction)_wrap_netk_window_unshade, METH_NOARGS, NULL }, + { "stick", (PyCFunction)_wrap_netk_window_stick, METH_NOARGS, NULL }, + { "unstick", (PyCFunction)_wrap_netk_window_unstick, METH_NOARGS, NULL }, + { "keyboard_move", (PyCFunction)_wrap_netk_window_keyboard_move, METH_NOARGS, NULL }, + { "keyboard_size", (PyCFunction)_wrap_netk_window_keyboard_size, METH_NOARGS, NULL }, + { "get_workspace", (PyCFunction)_wrap_netk_window_get_workspace, METH_NOARGS, NULL }, + { "move_to_workspace", (PyCFunction)_wrap_netk_window_move_to_workspace, METH_VARARGS|METH_KEYWORDS, NULL }, + { "is_pinned", (PyCFunction)_wrap_netk_window_is_pinned, METH_NOARGS, NULL }, + { "pin", (PyCFunction)_wrap_netk_window_pin, METH_NOARGS, NULL }, + { "unpin", (PyCFunction)_wrap_netk_window_unpin, METH_NOARGS, NULL }, + { "activate", (PyCFunction)_wrap_netk_window_activate, METH_NOARGS, NULL }, + { "is_active", (PyCFunction)_wrap_netk_window_is_active, METH_NOARGS, NULL }, + { "activate_transient", (PyCFunction)_wrap_netk_window_activate_transient, METH_NOARGS, NULL }, + { "get_icon", (PyCFunction)_wrap_netk_window_get_icon, METH_NOARGS, NULL }, + { "get_mini_icon", (PyCFunction)_wrap_netk_window_get_mini_icon, METH_NOARGS, NULL }, + { "get_icon_is_fallback", (PyCFunction)_wrap_netk_window_get_icon_is_fallback, METH_NOARGS, NULL }, + { "set_icon_geometry", (PyCFunction)_wrap_netk_window_set_icon_geometry, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_actions", (PyCFunction)_wrap_netk_window_get_actions, METH_NOARGS, NULL }, + { "get_state", (PyCFunction)_wrap_netk_window_get_state, METH_NOARGS, NULL }, + { "get_geometry", (PyCFunction)_wrap_netk_window_get_geometry, METH_NOARGS, NULL }, + { "is_visible_on_workspace", (PyCFunction)_wrap_netk_window_is_visible_on_workspace, METH_VARARGS|METH_KEYWORDS, NULL }, + { "is_on_workspace", (PyCFunction)_wrap_netk_window_is_on_workspace, METH_VARARGS|METH_KEYWORDS, NULL }, + { "is_in_viewport", (PyCFunction)_wrap_netk_window_is_in_viewport, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyNetkWindow_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "window.Window", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "window.Window", /* 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 */ + (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 */ - _PyNetkWindow_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 */ - 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 */ + (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 */ + _PyNetkWindow_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 */ + 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 */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -729,8 +735,8 @@ } PyMethodDef pywindow_functions[] = { - { "window_get", (PyCFunction)_wrap_netk_window_get, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "window_get", (PyCFunction)_wrap_netk_window_get, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; Index: netk/enum_types.c =================================================================== --- netk/enum_types.c (revision 15848) +++ netk/enum_types.c (working copy) @@ -23,7 +23,7 @@ /* ----------- functions ----------- */ PyMethodDef pyenum_types_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: util/fileutils.c =================================================================== --- util/fileutils.c (revision 15848) +++ util/fileutils.c (working copy) @@ -23,7 +23,7 @@ /* ----------- functions ----------- */ PyMethodDef pyfileutils_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: util/rc.c =================================================================== --- util/rc.c (revision 15848) +++ util/rc.c (working copy) @@ -23,7 +23,7 @@ /* ----------- functions ----------- */ PyMethodDef pyrc_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: util/miscutils.c =================================================================== --- util/miscutils.c (revision 15848) +++ util/miscutils.c (working copy) @@ -59,10 +59,10 @@ } PyMethodDef pymiscutils_functions[] = { - { "version_string", (PyCFunction)_wrap_xfce_version_string, METH_NOARGS }, - { "get_homedir", (PyCFunction)_wrap_xfce_get_homedir, METH_NOARGS }, - { "get_userdir", (PyCFunction)_wrap_xfce_get_userdir, METH_NOARGS }, - { NULL, NULL, 0 } + { "version_string", (PyCFunction)_wrap_xfce_version_string, METH_NOARGS, NULL }, + { "get_homedir", (PyCFunction)_wrap_xfce_get_homedir, METH_NOARGS, NULL }, + { "get_userdir", (PyCFunction)_wrap_xfce_get_userdir, METH_NOARGS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: util/i18n.c =================================================================== --- util/i18n.c (revision 15848) +++ util/i18n.c (working copy) @@ -130,13 +130,13 @@ } PyMethodDef pyi18n_functions[] = { - { "strip_context", (PyCFunction)_wrap_xfce_strip_context, METH_VARARGS|METH_KEYWORDS }, - { "get_file_localized", (PyCFunction)_wrap_xfce_get_file_localized, METH_VARARGS|METH_KEYWORDS }, - { "get_dir_localized", (PyCFunction)_wrap_xfce_get_dir_localized, METH_VARARGS|METH_KEYWORDS }, - { "get_file_localized_r", (PyCFunction)_wrap_xfce_get_file_localized_r, METH_VARARGS|METH_KEYWORDS }, - { "get_dir_localized_r", (PyCFunction)_wrap_xfce_get_dir_localized_r, METH_VARARGS|METH_KEYWORDS }, - { "locale_match", (PyCFunction)_wrap_xfce_locale_match, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "strip_context", (PyCFunction)_wrap_xfce_strip_context, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_file_localized", (PyCFunction)_wrap_xfce_get_file_localized, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_dir_localized", (PyCFunction)_wrap_xfce_get_dir_localized, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_file_localized_r", (PyCFunction)_wrap_xfce_get_file_localized_r, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_dir_localized_r", (PyCFunction)_wrap_xfce_get_dir_localized_r, METH_VARARGS|METH_KEYWORDS, NULL }, + { "locale_match", (PyCFunction)_wrap_xfce_locale_match, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: util/kiosk.c =================================================================== --- util/kiosk.c (revision 15848) +++ util/kiosk.c (working copy) @@ -23,7 +23,7 @@ /* ----------- functions ----------- */ PyMethodDef pykiosk_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: util/utf8.c =================================================================== --- util/utf8.c (revision 15848) +++ util/utf8.c (working copy) @@ -43,8 +43,8 @@ } PyMethodDef pyutf8_functions[] = { - { "utf8_remove_controls", (PyCFunction)_wrap_xfce_utf8_remove_controls, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "utf8_remove_controls", (PyCFunction)_wrap_xfce_utf8_remove_controls, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */ Index: util/resource.c =================================================================== --- util/resource.c (revision 15848) +++ util/resource.c (working copy) @@ -104,11 +104,11 @@ } PyMethodDef pyresource_functions[] = { - { "resource_lookup", (PyCFunction)_wrap_xfce_resource_lookup, METH_VARARGS|METH_KEYWORDS }, - { "resource_push_path", (PyCFunction)_wrap_xfce_resource_push_path, METH_VARARGS|METH_KEYWORDS }, - { "resource_pop_path", (PyCFunction)_wrap_xfce_resource_pop_path, METH_VARARGS|METH_KEYWORDS }, - { "resource_save_location", (PyCFunction)_wrap_xfce_resource_save_location, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "resource_lookup", (PyCFunction)_wrap_xfce_resource_lookup, METH_VARARGS|METH_KEYWORDS, NULL }, + { "resource_push_path", (PyCFunction)_wrap_xfce_resource_push_path, METH_VARARGS|METH_KEYWORDS, NULL }, + { "resource_pop_path", (PyCFunction)_wrap_xfce_resource_pop_path, METH_VARARGS|METH_KEYWORDS, NULL }, + { "resource_save_location", (PyCFunction)_wrap_xfce_resource_save_location, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; Index: util/desktopentry.c =================================================================== --- util/desktopentry.c (revision 15848) +++ util/desktopentry.c (working copy) @@ -104,56 +104,62 @@ static PyMethodDef _PyXfceDesktopEntry_methods[] = { - { "parse", (PyCFunction)_wrap_xfce_desktop_entry_parse, METH_NOARGS }, - { "get_file", (PyCFunction)_wrap_xfce_desktop_entry_get_file, METH_NOARGS }, - { "get_string", (PyCFunction)_wrap_xfce_desktop_entry_get_string, METH_VARARGS|METH_KEYWORDS }, - { "get_int", (PyCFunction)_wrap_xfce_desktop_entry_get_int, METH_VARARGS|METH_KEYWORDS }, - { NULL, NULL, 0 } + { "parse", (PyCFunction)_wrap_xfce_desktop_entry_parse, METH_NOARGS, NULL }, + { "get_file", (PyCFunction)_wrap_xfce_desktop_entry_get_file, METH_NOARGS, NULL }, + { "get_string", (PyCFunction)_wrap_xfce_desktop_entry_get_string, METH_VARARGS|METH_KEYWORDS, NULL }, + { "get_int", (PyCFunction)_wrap_xfce_desktop_entry_get_int, METH_VARARGS|METH_KEYWORDS, NULL }, + { NULL, NULL, 0, NULL } }; PyTypeObject PyXfceDesktopEntry_Type = { PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "desktopentry.DesktopEntry", /* tp_name */ - sizeof(PyGObject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* ob_size */ + "desktopentry.DesktopEntry", /* 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 */ + (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 */ - _PyXfceDesktopEntry_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 */ - offsetof(PyGObject, inst_dict), /* tp_dictoffset */ - (initproc)pygobject_no_constructor, /* tp_init */ - (allocfunc)0, /* tp_alloc */ - (newfunc)0, /* tp_new */ - (freefunc)0, /* tp_free */ - (inquiry)0 /* tp_is_gc */ + (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 */ + _PyXfceDesktopEntry_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 */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)pygobject_no_constructor, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0, /* tp_is_gc */ + NULL, /* tp_bases */ + NULL, /* tp_mro */ + NULL, /* tp_cache */ + NULL, /* tp_subclasses */ + NULL, /* tp_weaklist */ + NULL, /* tp_del */ }; @@ -161,7 +167,7 @@ /* ----------- functions ----------- */ PyMethodDef pydesktopentry_functions[] = { - { NULL, NULL, 0 } + { NULL, NULL, 0, NULL } }; /* initialise stuff extension classes */