aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-02 05:47:55 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-02 05:47:55 +0800
commitfc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b (patch)
treecafc97f10755573e31c7324ee460a36b6e5b98ae
parenta611e132e9ddb796d37c63479acb7b5d300c69e8 (diff)
downloadgsoc2013-evolution-fc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b.tar
gsoc2013-evolution-fc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b.tar.gz
gsoc2013-evolution-fc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b.tar.bz2
gsoc2013-evolution-fc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b.tar.lz
gsoc2013-evolution-fc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b.tar.xz
gsoc2013-evolution-fc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b.tar.zst
gsoc2013-evolution-fc0d5a9556b9f1ed0aa1514dd26b6b737c495a1b.zip
(E_MAKE_X_TYPE): Update for libbonobo 2.0.
svn path=/trunk/; revision=18491
-rw-r--r--e-util/e-util.h45
1 files changed, 25 insertions, 20 deletions
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) \