[glibmm/glibmm-2-36] gmmproc: Fix _WRAP_SIGNAL(custom_c_callback) for void func().
- From: José Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/glibmm-2-36] gmmproc: Fix _WRAP_SIGNAL(custom_c_callback) for void func().
- Date: Mon, 29 Apr 2013 21:43:00 +0000 (UTC)
commit da72f94635152cfc4eeeb926a0740b20a89052b0
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Mon Apr 29 09:19:53 2013 +0200
gmmproc: Fix _WRAP_SIGNAL(custom_c_callback) for void func().
* tools/m4/signal.m4: If custom_c_callback is specified, and the signal
handler takes no arguments and returns void, generate a SignalProxyInfo
structure with pointers to local functions instead of
&Glib::SignalProxyNormal::slot0_void_callback. Bug #605728.
ChangeLog | 9 +++++++++
tools/m4/signal.m4 | 5 +++--
2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f9eb1c3..70e8918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-04-29 Kjell Ahlstedt <kjell ahlstedt bredband net>
+
+ gmmproc: Fix _WRAP_SIGNAL(custom_c_callback) for void func().
+
+ * tools/m4/signal.m4: If custom_c_callback is specified, and the signal
+ handler takes no arguments and returns void, generate a SignalProxyInfo
+ structure with pointers to local functions instead of
+ &Glib::SignalProxyNormal::slot0_void_callback. Bug #605728.
+
2013-04-25 José Alburquerque <jaalburquerque gmail com>
Interface: Add a comment about overriding properties in constructor.
diff --git a/tools/m4/signal.m4 b/tools/m4/signal.m4
index f9802eb..bb487ea 100644
--- a/tools/m4/signal.m4
+++ b/tools/m4/signal.m4
@@ -34,9 +34,10 @@ ifelse(`$11',,,`#ifdef $11'
ifelse(`$9',,,`_DEPRECATE_IFDEF_START
')dnl
dnl
-ifelse($2`'_NUM($3)`'$5`'_NUM($6),`void0void0',`dnl
+ifelse($2`'_NUM($3)`'$5`'_NUM($6)`'$8,`void0void00',`dnl
dnl
-dnl Use predefined callback for SignalProxy0<void>, to reduce code size.
+dnl Use predefined callback for SignalProxy0<void>, to reduce code size,
+dnl if custom_c_callback is not specified.
static const Glib::SignalProxyInfo __CPPNAME__`'_signal_$4_info =
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]