diff --git a/geany-plugins/build/geanygendoc.m4 b/geany-plugins/build/geanygendoc.m4
index 79d7489..543bcc6 100644
--- a/geany-plugins/build/geanygendoc.m4
+++ b/geany-plugins/build/geanygendoc.m4
@@ -8,7 +8,7 @@ AC_DEFUN([GP_CHECK_GEANYGENDOC],
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
@@ -50,7 +50,6 @@ AC_DEFUN([GP_CHECK_GEANYGENDOC],
GP_STATUS_PLUGIN_ADD([GeanyGenDoc], [$enable_geanygendoc])
AC_CONFIG_FILES([
- geanygendoc/README
geanygendoc/Makefile
geanygendoc/src/Makefile
geanygendoc/data/Makefile
diff --git a/geany-plugins/geanygendoc/ChangeLog b/geany-plugins/geanygendoc/ChangeLog
index f211dc3..b469586 100644
--- a/geany-plugins/geanygendoc/ChangeLog
+++ b/geany-plugins/geanygendoc/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-17 Colomban Wendling <ban(at)herbesfolles(dot)org>
+
+ * ../build/geanygendoc.m4, README.in -> README:
+ Don't pre-process README anymore. It isn't needed anymore since the version
+ number was removed, and this version number was wrong anyway since the the
+ plugin is part of Geany-plugins.
+
+
2010-06-12 Colomban Wendling <ban(at)herbesfolles(dot)org>
* src/ggd-tag-utils.c:
diff --git a/geany-plugins/geanygendoc/README b/geany-plugins/geanygendoc/README
new file mode 100644
index 0000000..33984e7
--- /dev/null
+++ b/geany-plugins/geanygendoc/README
@@ -0,0 +1,37 @@
+General Information
+===================
+
+This is GeanyGenDoc 0.1, a plugin for Geany that aims to automatically
+generate documentation comment basis from the source code.
+
+Requirements
+============
+
+You will need the following packages to build GeanyGenDoc:
+ - Geany >= 0.19 (http://www.geany.org/)
+ - GTK+ >= 2.12 (http://www.gtk.org)
+ - GLib >= 2.14 (http://www.gtk.org)
+ - GIO >= 2.18 (http://www.gtk.org)
+ - CTPL >= 0.3 (http://ctpl.tuxfamily.org/)
+ - A working C compiler (GCC for example, http://gcc.gnu.org/)
+ - A working make implementation (GNU make is recommended,
+ http://www.gnu.org/software/make/)
+
+You may also want the following packages that enables extra features:
+ - Docutils (http://docutils.sourceforge.net/) -- or another implementation of
+ rst2html -- is needed to (re)generate the HTML manual.
+
+
+Installation
+============
+
+Compiling and installing the plugin is done by the following commands:
+
+ $ ./configure
+ $ make
+ $ make install
+
+For more configuration details run
+ $ ./configure --help
+
+For detailed instructions, see the INSTALL file.
diff --git a/geany-plugins/geanygendoc/README.in b/geany-plugins/geanygendoc/README.in
deleted file mode 100644
index 25d4a3c..0000000
--- a/geany-plugins/geanygendoc/README.in
+++ /dev/null
@@ -1,37 +0,0 @@
-General Information
-===================
-
-This is GeanyGenDoc @VERSION@, a plugin for Geany that aims to automatically
-generate documentation comment basis from the source code.
-
-Requirements
-============
-
-You will need the following packages to build GeanyGenDoc:
- - Geany >= 0.19 (http://www.geany.org/)
- - GTK+ >= 2.12 (http://www.gtk.org)
- - GLib >= 2.14 (http://www.gtk.org)
- - GIO >= 2.18 (http://www.gtk.org)
- - CTPL >= 0.2 (http://ctpl.tuxfamily.org/)
- - A working C compiler (GCC for example, http://gcc.gnu.org/)
- - A working make implementation (GNU make is recommended,
- http://www.gnu.org/software/make/)
-
-You may also want the following packages that enables extra features:
- - Docutils (http://docutils.sourceforge.net/) -- or another implementation of
- rst2html -- is needed to (re)generate the HTML manual.
-
-
-Installation
-============
-
-Compiling and installing the plugin is done by the following commands:
-
- $ ./configure
- $ make
- $ make install
-
-For more configuration details run
- $ ./configure --help
-
-For detailed instructions, see the INSTALL file.
diff --git a/geany-plugins/geanygendoc/src/ggd-doc-setting.c b/geany-plugins/geanygendoc/src/ggd-doc-setting.c
index cc7a2d4..173bc23 100644
--- a/geany-plugins/geanygendoc/src/ggd-doc-setting.c
+++ b/geany-plugins/geanygendoc/src/ggd-doc-setting.c
@@ -89,7 +89,7 @@ ggd_doc_setting_unref (GgdDocSetting *setting)
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);
}
}
diff --git a/geany-plugins/geanygendoc/src/ggd-file-type-loader.c b/geany-plugins/geanygendoc/src/ggd-file-type-loader.c
index ad7f1ce..c987046 100644
--- a/geany-plugins/geanygendoc/src/ggd-file-type-loader.c
+++ b/geany-plugins/geanygendoc/src/ggd-file-type-loader.c
@@ -152,7 +152,7 @@ ggd_file_type_read_setting_template (GScanner *scanner,
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;
}
diff --git a/geany-plugins/geanygendoc/src/ggd-file-type.c b/geany-plugins/geanygendoc/src/ggd-file-type.c
index 2e741e3..8cb545a 100644
--- a/geany-plugins/geanygendoc/src/ggd-file-type.c
+++ b/geany-plugins/geanygendoc/src/ggd-file-type.c
@@ -98,7 +98,7 @@ ggd_file_type_unref (GgdFileType *filetype)
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);
}
}
diff --git a/geany-plugins/wscript b/geany-plugins/wscript
index 5334047..db8d41f 100644
--- a/geany-plugins/wscript
+++ b/geany-plugins/wscript
@@ -78,7 +78,7 @@ plugins = [
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']),