From a352a00ec1bf767c9d2655a9ecd966b03cfff24f Mon Sep 17 00:00:00 2001
From: George Lebl <jirka@5z.com>
Date: Thu, 12 Apr 2001 18:43:00 -0800
Subject: [PATCH] Release 1.0.8

---
 ChangeLog    | 13 +++++++++++++
 NEWS         |  3 +++
 README       |  1 +
 configure    |  2 +-
 configure.in |  2 +-
 gob.spec     |  2 +-
 src/main.c   |  7 +++++--
 7 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4190e2..d91f155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Apr 12 09:19:58 2001  George Lebl <jirka@5z.com>
+
+	* Release 1.0.8
+
+Sat Mar 31 00:24:58 2001  George Lebl <jirka@5z.com>
+
+	* src/main.c: fix crash with marshallers of signals with a return
+          type and no arguments.
+
+Tue Feb 27 00:53:41 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* README: Use my new-found maintainer status!!! The power!
+
 Sun Feb 25 17:17:46 2001  George Lebl <jirka@5z.com>
 
 	* Release 1.0.7
diff --git a/NEWS b/NEWS
index 045c60f..8ec51d6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+1.0.8
+	* fix signals with a return value and no argument
+
 1.0.7
 	* allow overriding of get_type (allows BonoboXObject)
 
diff --git a/README b/README
index cb1c740..23a952d 100644
--- a/README
+++ b/README
@@ -1,4 +1,5 @@
 GTK+ Object Builder (GOB)
+(George's Obfuscated Bits)
 
 Very simple preprocessor for making GTK+ objects with inline C code so that
 generated files are not editted.  Syntax is inspired by java and yacc or lex.
diff --git a/configure b/configure
index d013f62..01a92dc 100755
--- a/configure
+++ b/configure
@@ -703,7 +703,7 @@ fi
 
 PACKAGE=gob
 
-VERSION=1.0.7
+VERSION=1.0.8
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/configure.in b/configure.in
index 91e1277..7c5b251 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.2)
 AC_INIT(src/treefuncs.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gob,1.0.7)
+AM_INIT_AUTOMAKE(gob,1.0.8)
 
 dnl
 dnl  An utter hack to allow embedding of gob inside other packages.
diff --git a/gob.spec b/gob.spec
index 06064db..acc349c 100644
--- a/gob.spec
+++ b/gob.spec
@@ -1,4 +1,4 @@
-%define  ver     1.0.7
+%define  ver     1.0.8
 %define  rel     1
 %define  prefix  /usr
 
diff --git a/src/main.c b/src/main.c
index d94361a..a3682d1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -752,14 +752,17 @@ add_signal_prots(Method *m)
 			"\t(*rfunc)((%s *)object", s, s, typebase);
 	} else {
 		const char *retcast = get_cast(m->gtktypes->data, FALSE);
+		gboolean is_none = (strcmp(m->gtktypes->next->data, "NONE")==0);
 		out_printf(out,
 			   "\t___%s rfunc;\n\t"
 			   "%s *retval;\n\n"
 			   "\trfunc = (___%s)func;\n\n"
 			   "\tretval = GTK_RETLOC_%s(args[%d]);\n\n"
 			   "\t*retval = (*rfunc)((%s *)object",
-			   s, retcast, s, (char *)m->gtktypes->data,
-			   g_list_length(m->gtktypes)-1, typebase);
+			   s, retcast, s,
+			   (char *)m->gtktypes->data,
+			   g_list_length(m->gtktypes) - (is_none ? 2 : 1),
+			   typebase);
 	}
 	print_signal_marsal_args(m);
 
-- 
2.43.2