Add g_type_register_static_simple

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 90b98167dd9d5640cb4e0108583f9656f20eb60f..62f66076844beecf7bf4ff7c243374382d657fcb 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * gobject.symbols:
+       * gtype.[hc]: Add a g_type_register_static_simple
+       variant of g_type_register_static that does not take 
+       a relocation-causing GTypeInfo struct, and use it 
+       in G_DEFINE_TYPE.
+
 2006-03-07  Matthias Clasen  <mclasen@redhat.com>
 
        * ===  Released 2.10.1 ===

diff --git a/gobject/gobject.symbols b/gobject/gobject.symbols
index 7d2648fdbeefccc2f7f9e9a91aabe77c9592583a..24db3181b6686ef5611aeb3e9b28b720d17ecf01 100644 (file)
--- a/gobject/gobject.symbols
+++ b/gobject/gobject.symbols
@@ -16,6 +16,7 @@
 g_boxed_copy
 g_boxed_free
 g_boxed_type_register_static
+g_boxed_type_register_static_simple
 g_date_get_type G_GNUC_CONST
 g_gstring_get_type G_GNUC_CONST
 g_strv_get_type G_GNUC_CONST

diff --git a/gobject/gtype.c b/gobject/gtype.c
index 95518f119ff5e855896da0926a0df950df1b4890..45d7590a34953ececc774811b6fea3a5b7597819 100644 (file)
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -2203,6 +2203,31 @@ g_type_register_fundamental (GType                       type_id,
   return NODE_TYPE (node);
 }
 
+GType
+g_type_register_static_simple (GType             parent_type,
+                              const gchar      *type_name,
+                              guint             class_size,
+                              GClassInitFunc    class_init,
+                              guint             instance_size,
+                              GInstanceInitFunc instance_init,
+                              GTypeFlags        flags)
+{
+  GTypeInfo info;
+
+  info.class_size = class_size;
+  info.base_init = NULL;
+  info.base_finalize = NULL;
+  info.class_init = class_init;
+  info.class_finalize = NULL;
+  info.class_data = NULL;
+  info.instance_size = instance_size;
+  info.n_preallocs = 0;
+  info.instance_init = instance_init;
+  info.value_table = NULL;
+
+  g_type_register_static (parent_type, type_name, &info, flags);
+}
+
 GType
 g_type_register_static (GType            parent_type,
                        const gchar     *type_name,

diff --git a/gobject/gtype.h b/gobject/gtype.h
index 4ab0367f333aea33d91169b6cabde3f3e4684c30..538d641b6273ae890d0cd5ef6ba31b0fb1072657 100644 (file)
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -287,6 +287,14 @@ GType g_type_register_static               (GType                       parent_type,
                                         const gchar                *type_name,
                                         const GTypeInfo            *info,
                                         GTypeFlags                  flags);
+GType g_type_register_static_simple     (GType                       parent_type,
+                                        const gchar                *type_name,
+                                        guint                       class_size,
+                                        GClassInitFunc              class_init,
+                                        guint                       instance_size,
+                                        GInstanceInitFunc           instance_init,
+                                        GTypeFlags                  flags);
+  
 GType g_type_register_dynamic          (GType                       parent_type,
                                         const gchar                *type_name,
                                         GTypePlugin                *plugin,
@@ -362,19 +370,14 @@ type_name##_get_type (void) \
   static GType g_define_type_id = 0; \
   if (G_UNLIKELY (g_define_type_id == 0)) \
     { \
-      static const GTypeInfo g_define_type_info = { \
-        sizeof (TypeName##Class), \
-        (GBaseInitFunc) NULL, \
-        (GBaseFinalizeFunc) NULL, \
-        (GClassInitFunc) type_name##_class_intern_init, \
-        (GClassFinalizeFunc) NULL, \
-        NULL,   /* class_data */ \
-        sizeof (TypeName), \
-        0,      /* n_preallocs */ \
-        (GInstanceInitFunc) type_name##_init, \
-        NULL    /* value_table */ \
-      }; \
-      g_define_type_id = g_type_register_static (TYPE_PARENT, g_intern_static_string (#TypeName), &g_define_type_info, (GTypeFlags) flags); \
+      g_define_type_id = \
+        g_type_register_static_simple (TYPE_PARENT, \
+                                       g_intern_static_string (#TypeName), \
+                                       sizeof (TypeName##Class), \
+                                       type_name##_class_intern_init, \
+                                       sizeof (TypeName), \
+                                       type_name##_init, \
+                                       (GTypeFlags) flags); \
       { CODE ; } \
     } \
   return g_define_type_id; \