summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2012-02-14 14:47:38 -0500
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2012-02-14 14:49:51 -0500
commit658733d60d55d35617c86346673aab9a22ca6fe7 (patch)
tree56f4c76efbe3f7253fa4128b4dc69cc08b70bfbf
parent81fa8a14a45d80ae27bc4055645ebdd952bd3967 (diff)
downloadglibmm-658733d60d55d35617c86346673aab9a22ca6fe7.tar.gz
gmmproc: docs: Remove possible parens in gtk-doc signal references.
* tools/pm/DocsParser.pm: Discard possible parenthesis following a gtk-doc signal reference. This avoids a double set of parenthesis appearing in the documentation. Bug #668918.
-rw-r--r--ChangeLog10
-rw-r--r--tools/pm/DocsParser.pm4
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 728048c3..5eef3def 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2012-02-14 José Alburquerque <jaalburquerque@gmail.com>
+ gmmproc: docs: Remove possible parens in gtk-doc signal references.
+
+ * tools/pm/DocsParser.pm: Discard possible parenthesis following a
+ gtk-doc signal reference. This avoids a double set of parenthesis
+ appearing in the documentation.
+
+ Bug #668918.
+
+2012-02-14 José Alburquerque <jaalburquerque@gmail.com>
+
Gio::DBus::Proxy: Add a TODO.
* gio/src/dbusproxy.hg: Add a TODO.
diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm
index 443d9b3f..0a711372 100644
--- a/tools/pm/DocsParser.pm
+++ b/tools/pm/DocsParser.pm
@@ -450,8 +450,8 @@ sub substitute_identifiers($$)
s/([A-Z]\w+)::([a-z\d-]+)(\s+property)/my $name = "$1::property_$2()$3"; $name =~ s"-"_"g; "$name";/ge;
# Convert signal names to C++.
- s/(^|\s)::([a-z\d-]+)([^:\w]|$)/my $name = "$1signal_$2()$3"; $name =~ s"-"_"g; "$name";/ge;
- s/(#[A-Z]\w+)::([a-z\d-]+)([^:\w]|$)/my $name = "$1::signal_$2()$3"; $name =~ s"-"_"g; "$name";/ge;
+ s/(^|\s)::([a-z\d-]+)(\(\))*([^:\w]|$)/my $name = "$1signal_$2()$4"; $name =~ s"-"_"g; "$name";/ge;
+ s/(#[A-Z]\w+)::([a-z\d-]+)(\(\))*([^:\w]|$)/my $name = "$1::signal_$2()$4"; $name =~ s"-"_"g; "$name";/ge;
s/[#%]([A-Z][a-z]*)([A-Z][A-Za-z]+)\b/$1::$2/g; # type names