diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gobject/pygoptioncontext.c | 4 | ||||
| -rw-r--r-- | m4/python.m4 | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2006-07-13 Gustavo J. A. M. Carneiro <gjc@inescporto.pt> + + * m4/python.m4: Properly quote AM_CHECK_PYMOD definition. + + * gobject/pygoptioncontext.c (pyg_option_context_parse): Fix mem + leak. + 2006-07-12 Johan Dahlin <jdahlin@async.com.br> * Makefile.am: diff --git a/gobject/pygoptioncontext.c b/gobject/pygoptioncontext.c index c58c410..7996fb6 100644 --- a/gobject/pygoptioncontext.c +++ b/gobject/pygoptioncontext.c @@ -108,7 +108,7 @@ pyg_option_context_parse(PyGOptionContext *self, if (!result) { - g_free(argv_content); + g_strfreev(argv_content); g_strfreev(original); pyg_error_check(&error); return NULL; @@ -122,7 +122,7 @@ pyg_option_context_parse(PyGOptionContext *self, } g_strfreev(original); - g_free(argv_content); + g_strfreev(argv_content); return new_argv; } diff --git a/m4/python.m4 b/m4/python.m4 index a1396df..e1c5266 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -1,7 +1,7 @@ ## this one is commonly used with AM_PATH_PYTHONDIR ... dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) dnl Check if a module containing a given symbol is visible to python. -AC_DEFUN(AM_CHECK_PYMOD, +AC_DEFUN([AM_CHECK_PYMOD], [AC_REQUIRE([AM_PATH_PYTHON]) py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) |