Revision: 1645 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1645&view=re... Author: colombanw Date: 2010-10-09 16:20:18 +0000 (Sat, 09 Oct 2010)

Log Message: ----------- GeanyGenDoc: Use new CTPL version 0.3

Modified Paths: -------------- trunk/geany-plugins/build/geanygendoc.m4 trunk/geany-plugins/geanygendoc/src/ggd-doc-setting.c trunk/geany-plugins/geanygendoc/src/ggd-file-type-loader.c trunk/geany-plugins/geanygendoc/src/ggd-file-type.c trunk/geany-plugins/wscript

Modified: trunk/geany-plugins/build/geanygendoc.m4 =================================================================== --- trunk/geany-plugins/build/geanygendoc.m4 2010-10-09 10:02:52 UTC (rev 1644) +++ trunk/geany-plugins/build/geanygendoc.m4 2010-10-09 16:20:18 UTC (rev 1645) @@ -8,7 +8,7 @@ GTK_VERSION=2.12 GLIB_VERSION=2.14 GIO_VERSION=2.18 - CTPL_VERSION=0.2 + CTPL_VERSION=0.3

geanygendoc_have_gtk=no geanygendoc_have_glib=no

Modified: trunk/geany-plugins/geanygendoc/src/ggd-doc-setting.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-doc-setting.c 2010-10-09 10:02:52 UTC (rev 1644) +++ trunk/geany-plugins/geanygendoc/src/ggd-doc-setting.c 2010-10-09 16:20:18 UTC (rev 1645) @@ -89,7 +89,7 @@

if (g_atomic_int_dec_and_test (&setting->ref_count)) { g_free (setting->match); - ctpl_lexer_free_tree (setting->template); + ctpl_token_free (setting->template); g_slice_free1 (sizeof *setting, setting); } }

Modified: trunk/geany-plugins/geanygendoc/src/ggd-file-type-loader.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-file-type-loader.c 2010-10-09 10:02:52 UTC (rev 1644) +++ trunk/geany-plugins/geanygendoc/src/ggd-file-type-loader.c 2010-10-09 16:20:18 UTC (rev 1645) @@ -152,7 +152,7 @@ g_scanner_error (scanner, _("invalid template: %s"), err->message); g_error_free (err); } else { - ctpl_lexer_free_tree (setting->template); + ctpl_token_free (setting->template); setting->template = tree; success = TRUE; }

Modified: trunk/geany-plugins/geanygendoc/src/ggd-file-type.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-file-type.c 2010-10-09 10:02:52 UTC (rev 1644) +++ trunk/geany-plugins/geanygendoc/src/ggd-file-type.c 2010-10-09 16:20:18 UTC (rev 1645) @@ -98,7 +98,7 @@ if (filetype->match_function_arguments) { g_regex_unref (filetype->match_function_arguments); } - ctpl_environ_free (filetype->user_env); + ctpl_environ_unref (filetype->user_env); g_slice_free1 (sizeof *filetype, filetype); } }

Modified: trunk/geany-plugins/wscript =================================================================== --- trunk/geany-plugins/wscript 2010-10-09 10:02:52 UTC (rev 1644) +++ trunk/geany-plugins/wscript 2010-10-09 16:20:18 UTC (rev 1645) @@ -78,7 +78,7 @@ Plugin('CodeNav', None, [ 'codenav/src' ]), Plugin('GeanyDoc', None, [ 'geanydoc/src' ]), Plugin('GeanyExtraSel', None, [ 'geanyextrasel/src' ]), - Plugin('GeanyGenDoc', None, [ 'geanygendoc/src' ], [ [ 'ctpl', '0.2', True ] ]), + Plugin('GeanyGenDoc', None, [ 'geanygendoc/src' ], [ [ 'ctpl', '0.3', True ] ]), Plugin('GeanyInsertNum', None, [ 'geanyinsertnum/src' ]), Plugin('GeanyLaTeX', None, [ 'geanylatex/src']), Plugin('GeanyLipsum', None, [ 'geanylipsum/src']),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.