summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjell.ahlstedt@bredband.net>2011-09-02 19:24:39 +0200
committerMurray Cumming <murrayc@murrayc.com>2011-09-06 08:58:06 +0200
commit6b7e9f8150a57ab7530ab56467127e13b18273a3 (patch)
tree494c5b0cea7b321eec8a5f85344f4f675a278460
parent23036b5cdb42304817466b8cd91ee01f86d2d61c (diff)
downloadglibmm-6b7e9f8150a57ab7530ab56467127e13b18273a3.tar.gz
gmmproc: Correct handling of constversion etc. in _WRAP_METHOD.
* tools/pm/WrapParser.pm: The parameters refreturn, errthrow, and constversion in _WRAP_METHOD was applied also to following instances wrapping the same C function. Bug #657751, comment 5.
-rw-r--r--ChangeLog8
-rw-r--r--tools/pm/WrapParser.pm4
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 073f822d..4c71ae52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-02 Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
+
+ gmmproc: Correct handling of constversion etc. in _WRAP_METHOD.
+
+ * tools/pm/WrapParser.pm: The parameters refreturn, errthrow, and
+ constversion in _WRAP_METHOD was applied also to following instances
+ wrapping the same C function. Bug #657751, comment 5.
+
2.29.12:
2011-08-25 Chun-wei Fan <fanc999@src.gnome.org>
diff --git a/tools/pm/WrapParser.pm b/tools/pm/WrapParser.pm
index f31f16da..1b34f3cb 100644
--- a/tools/pm/WrapParser.pm
+++ b/tools/pm/WrapParser.pm
@@ -894,6 +894,9 @@ sub on_wrap_method($)
}
# Extra stuff needed?
+ $$objCfunc{rettype_needs_ref} = 0;
+ $$objCfunc{throw_any_errors} = 0;
+ $$objCfunc{constversion} = 0;
$$objCfunc{deprecated} = "";
my $deprecation_docs = "";
my $ifdef;
@@ -984,6 +987,7 @@ sub on_wrap_method_docs_only($)
}
# Extra ref needed?
+ $$objCfunc{throw_any_errors} = 0;
while($#args >= 1) # If the optional ref/err arguments are there.
{
my $argRef = string_trim(pop @args);