From 4f0369e24277442e70d0edaab02b022bc7a2b6f5 Mon Sep 17 00:00:00 2001
From: George Lebl <jirka@5z.com>
Date: Wed, 27 Oct 2004 01:33:00 -0800
Subject: [PATCH] Release 2.0.11

---
 ChangeLog    |  8 ++++++++
 NEWS         |  4 ++++
 configure    |  2 +-
 configure.in |  2 +-
 gob2.spec    |  2 +-
 src/main.c   | 10 +++++-----
 src/test.gob | 21 +++++++++++++++++----
 7 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 82b8b2f..2845d35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 26 16:30:44 2004  George Lebl <jirka@5z.com>
+
+	* Release 2.0.11
+
+Tue Oct 26 16:27:44 2004  George Lebl <jirka@5z.com>
+
+	* src/main.c: fix compile when overrides and privates are used
+
 Wed Sep 22 17:12:25 2004  George Lebl <jirka@5z.com>
 
 	* Release 2.0.10
diff --git a/NEWS b/NEWS
index 484e960..7e00747 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2.0.11:
+	* When privates and overrides were used in 2.0.10 compilation of
+	  object may have broken on some compilers.
+
 2.0.10:
 	* Support for overriding properties (Jean-Yves Lefort)
 	* Some M4 fixage with respect to NOINSTGOB (K. Haley)
diff --git a/configure b/configure
index 038527c..d66e14b 100755
--- a/configure
+++ b/configure
@@ -1561,7 +1561,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=gob2
- VERSION=2.0.10
+ VERSION=2.0.11
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index 57ceb8f..fd759e6 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(gob2,2.0.10)
+AM_INIT_AUTOMAKE(gob2,2.0.11)
 AM_MAINTAINER_MODE
 
 GLIB_REQUIRED=2.0.0
diff --git a/gob2.spec b/gob2.spec
index 86d1865..c57175f 100644
--- a/gob2.spec
+++ b/gob2.spec
@@ -1,4 +1,4 @@
-%define  ver     2.0.10
+%define  ver     2.0.11
 %define  rel     1
 %define  prefix  /usr
 
diff --git a/src/main.c b/src/main.c
index 39bc216..f62f2f7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2297,16 +2297,16 @@ add_inits(Class *c)
 				did_base_obj = TRUE;
 			}
 
+			if (overrides > 0)
+				add_overrides (c,
+					       ((FuncArg *)m->args->data)->name,
+					       did_base_obj);
+
 			if (privates > 0)
 				out_printf (out,
 					    "\n\tg_type_class_add_private(%s,sizeof(%sPrivate));\n",
 					    ((FuncArg *)m->args->data)->name,
 					    typebase);
-			
-			if (overrides > 0)
-				add_overrides (c,
-					       ((FuncArg *)m->args->data)->name,
-					       did_base_obj);
 
 			if (initializers > 0) {
 				GList *li;
diff --git a/src/test.gob b/src/test.gob
index b900902..3de497c 100644
--- a/src/test.gob
+++ b/src/test.gob
@@ -92,7 +92,7 @@ enum BUBLE {
         ALT
 } Buble:Enum;
 
-class Test:Object from G:Object
+class Test:Object from /*G:Object*/ Gtk:Container
 	(interface Gtk:Tree:Model)
 	/* We can add more interfaces by adding more lines like the above */
 	/* Note that there must exist a GtkTreeModelIface structure */
@@ -351,10 +351,23 @@ class Test:Object from G:Object
 		return NULL;
 	}
 	virtual int beh(self, int h (check > 0));
-	/*override(G:Object) void add(Gtk:Container * self (check null type),
-				         Gtk:Widget * wid (check null type)) {
+	override(Gtk:Container)
+	void add(Gtk:Container * self (check null type),
+                 Gtk:Widget * wid (check null type)) {
 		PARENT_HANDLER(self,wid);
-	}*/
+	}
+
+	override(G:Object)
+	void dispatch_properties_changed (G:Object      *object,
+					  guint	   n_pspecs,
+					  GParamSpec  **pspecs)
+	{
+		object = NULL;
+		n_pspecs = 0;
+		pspecs = NULL;
+		/* EKI! */
+	}
+
 	public int consttest(self, const gchar *text, ...)
 	{
 		text = NULL;
-- 
2.43.0