diff options
| author | Johan Dahlin <johan@gnome.org> | 2008-07-26 09:11:08 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-07-26 09:11:08 +0000 |
| commit | 59e8488b49d360992d8df5ca0664ba742411c933 (patch) | |
| tree | efd6663aea4774cc469617a3477996fc7960f396 /gobject/gobjectmodule.c | |
| parent | 7079b546e06dd77b61cd1ba4692a077a85b9e033 (diff) | |
| download | pygobject-59e8488b49d360992d8df5ca0664ba742411c933.tar.gz pygobject-59e8488b49d360992d8df5ca0664ba742411c933.tar.xz pygobject-59e8488b49d360992d8df5ca0664ba742411c933.zip | |
Move option over from gobject to glib.
2008-07-26 Johan Dahlin <johan@gnome.org>
* glib/Makefile.am:
* glib/glibmodule.c (pyglib_register_constants), (init_glib):
* glib/option.py:
* glib/pyglib.c (pyglib_init),
(pyglib_option_group_transfer_group), (pyglib_option_group_new),
(pyglib_option_context_new):
* glib/pyglib.h:
* glib/pygoptioncontext.c (pyg_option_context_parse),
(pyg_option_context_set_main_group),
(pyg_option_context_add_group),
(pyglib_option_context_register_types):
* glib/pygoptioncontext.h:
* glib/pygoptiongroup.c (arg_func),
(pyglib_option_group_register_types):
* glib/pygoptiongroup.h:
* gobject/Makefile.am:
* gobject/__init__.py:
* gobject/gobjectmodule.c (init_gobject):
* gobject/option.py:
* gobject/pygobject-private.h:
* gobject/pygoptioncontext.c:
* gobject/pygoptiongroup.c:
Move option over from gobject to glib.
svn path=/trunk/; revision=860
Diffstat (limited to 'gobject/gobjectmodule.c')
| -rw-r--r-- | gobject/gobjectmodule.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 81b8892..201381a 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -2656,7 +2656,7 @@ struct _PyGObject_Functions pygobject_api_functions = { pyg_type_register_custom_callback, pyg_gerror_exception_check, - pyg_option_group_new + pyglib_option_group_new }; @@ -2753,9 +2753,6 @@ init_gobject(void) PyType_Ready(&PyGObjectWeakRef_Type); PyDict_SetItemString(d, "GObjectWeakRef", (PyObject *) &PyGObjectWeakRef_Type); - REGISTER_TYPE(d, PyGOptionContext_Type, "OptionContext"); - REGISTER_TYPE(d, PyGOptionGroup_Type, "OptionGroup"); - /* pygobject version */ tuple = Py_BuildValue ("(iii)", PYGOBJECT_MAJOR_VERSION, @@ -2795,31 +2792,6 @@ init_gobject(void) PyModule_AddIntConstant(m, "PARAM_LAX_VALIDATION", G_PARAM_LAX_VALIDATION); PyModule_AddIntConstant(m, "PARAM_READWRITE", G_PARAM_READWRITE); - PyModule_AddIntConstant(m, "OPTION_FLAG_HIDDEN", - G_OPTION_FLAG_HIDDEN); - PyModule_AddIntConstant(m, "OPTION_FLAG_IN_MAIN", - G_OPTION_FLAG_IN_MAIN); - PyModule_AddIntConstant(m, "OPTION_FLAG_REVERSE", - G_OPTION_FLAG_REVERSE); - PyModule_AddIntConstant(m, "OPTION_FLAG_NO_ARG", - G_OPTION_FLAG_NO_ARG); - PyModule_AddIntConstant(m, "OPTION_FLAG_FILENAME", - G_OPTION_FLAG_FILENAME); - PyModule_AddIntConstant(m, "OPTION_FLAG_OPTIONAL_ARG", - G_OPTION_FLAG_OPTIONAL_ARG); - PyModule_AddIntConstant(m, "OPTION_FLAG_NOALIAS)", - G_OPTION_FLAG_NOALIAS); - PyModule_AddIntConstant(m, "OPTION_ERROR_UNKNOWN_OPTION", - G_OPTION_ERROR_UNKNOWN_OPTION); - PyModule_AddIntConstant(m, "OPTION_ERROR_BAD_VALUE", - G_OPTION_ERROR_BAD_VALUE); - PyModule_AddIntConstant(m, "OPTION_ERROR_FAILED", - G_OPTION_ERROR_FAILED); - PyModule_AddStringConstant(m, "OPTION_REMAINING", - G_OPTION_REMAINING); - PyModule_AddStringConstant(m, "OPTION_ERROR", - (char*) g_quark_to_string(G_OPTION_ERROR)); - /* The rest of the types are set in __init__.py */ PyModule_AddObject(m, "TYPE_INVALID", pyg_type_wrapper_new(G_TYPE_INVALID)); PyModule_AddObject(m, "TYPE_GSTRING", pyg_type_wrapper_new(G_TYPE_GSTRING)); |