From fc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 1 Nov 2002 21:47:55 +0000
Subject: (E_MAKE_X_TYPE): Update for libbonobo 2.0.

svn path=/trunk/; revision=18491
---
 e-util/e-util.h | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-util.h b/e-util/e-util.h
index b7a30d3dd3..1d5850ccf2 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -60,26 +60,31 @@ GType l##_get_type(void)\
 }
 
 
-#define E_MAKE_X_TYPE(l,str,t,ci,i,parent,poa_init,offset) \
-GtkType l##_get_type(void)\
-{\
-	static GtkType type = 0;\
-	if (!type){\
-		GtkTypeInfo info = {\
-			str,\
-			sizeof (t),\
-			sizeof (t##Class),\
-			(GtkClassInitFunc) ci,\
-			(GtkObjectInitFunc) i,\
-			NULL, /* reserved 1 */\
-			NULL, /* reserved 2 */\
-			(GtkClassInitFunc) NULL\
-		};\
-                type = bonobo_x_type_unique (\
-			parent, poa_init, NULL,\
-			offset, &info);\
-	}\
-	return type;\
+#define E_MAKE_X_TYPE(l,str,t,ci,i,parent,poa_init,offset)	\
+GtkType l##_get_type(void)					\
+{								\
+	static GtkType type = 0;				\
+	if (!type){						\
+		GTypeInfo info = {				\
+			sizeof (t##Class),			\
+								\
+			(GBaseInitFunc) NULL,			\
+			(GBaseFinalizeFunc) NULL,		\
+								\
+			(GClassInitFunc) ci,			\
+			(GClassFinalizeFunc) NULL,		\
+								\
+                        NULL, 	/* class_data */		\
+								\
+			sizeof (t),				\
+			0, 	/* n_preallocs */		\
+			(GInstanceInitFunc) i,			\
+		};						\
+                type = bonobo_x_type_unique (			\
+			parent, poa_init, NULL,			\
+			offset, &info, str);			\
+	}							\
+	return type;						\
 }
 
 #define GET_STRING_ARRAY_FROM_ELLIPSIS(labels, first_string) \
-- 
cgit v1.2.3