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 /glib/glibmodule.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 'glib/glibmodule.c')
| -rw-r--r-- | glib/glibmodule.c | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/glib/glibmodule.c b/glib/glibmodule.c index b4a5b09..dc7afca 100644 --- a/glib/glibmodule.c +++ b/glib/glibmodule.c @@ -32,6 +32,8 @@ #include "pygiochannel.h" #include "pygmaincontext.h" #include "pygmainloop.h" +#include "pygoptioncontext.h" +#include "pygoptiongroup.h" #include "pygsource.h" #include "pygspawn.h" @@ -679,8 +681,35 @@ pyglib_register_constants(PyObject *m) G_IO_FLAG_GET_MASK); PyModule_AddIntConstant(m, "IO_FLAG_SET_MASK", G_IO_FLAG_SET_MASK); - + + 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)); } + DL_EXPORT(void) init_glib(void) { @@ -698,4 +727,6 @@ init_glib(void) pyglib_maincontext_register_types(d); pyglib_source_register_types(d); pyglib_spawn_register_types(d); + pyglib_option_context_register_types(d); + pyglib_option_group_register_types(d); } |