Hi all,
tutorials and GLib/GTK+ code often use unnecessary static variables for
GTypeInfo and GInterfaceInfo structs, so I run the following script:
sed -i -e \
's/static\s\+\(\(const\s\+\)\?\(GInterfaceInfo\|GTypeInfo\)\)/\1/g' \
`find . -regex '.*\.\([ch]\|xml\|sgml\)'`
on a fresh tree of the latest stable releases: glib-2.22.2 and
gtk-2.18.3 (patches attached). I'm succesfully using them since tuesday.
I noticed Christian Persch as yet updated a number of GObject based
projects but the main ones still suffer from it (or maybe there is only
something I'm not aware of).
Ciao.
--
Nicola
>From 484aba20fff2062be1c86ae23b6d615edaac47b6 Mon Sep 17 00:00:00 2001
From: Nicola Fontana <n...@entidi.it>
Date: Mon, 26 Oct 2009 17:57:16 +0100
Subject: [PATCH] Do not use static GTypeInfo and GInterfaceInfo
Either g_type_register_static_simple (used by G_DEFINE_TYPE_EXTENDED)
and G_IMPLEMENT_INTERFACE use automatic variables for GTypeInfo and
GInterfaceInfo structs, while tutorials and source code often use
static variables. This commit consistently adopts the former method.
---
docs/reference/gobject/tut_gtype.xml | 8 ++++----
docs/reference/gobject/tut_howto.xml | 2 +-
gobject/gboxed.c | 4 ++--
gobject/genums.c | 2 +-
gobject/gobject.c | 2 +-
gobject/gparam.c | 2 +-
gobject/gtype.h | 2 +-
gobject/gtypemodule.c | 4 ++--
gobject/gtypeplugin.c | 2 +-
gobject/gvaluetypes.c | 4 ++--
gobject/testgobject.c | 6 +++---
tests/gobject/defaultiface.c | 2 +-
tests/gobject/deftype.c | 2 +-
tests/gobject/ifacecheck.c | 2 +-
tests/gobject/ifaceinit.c | 2 +-
tests/gobject/testcommon.h | 6 +++---
tests/refcount/objects.c | 2 +-
tests/refcount/objects2.c | 2 +-
tests/refcount/properties.c | 2 +-
tests/refcount/properties2.c | 2 +-
tests/refcount/signals.c | 2 +-
21 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/docs/reference/gobject/tut_gtype.xml b/docs/reference/gobject/tut_gtype.xml
index 2ea2bf3..df40e33 100644
--- a/docs/reference/gobject/tut_gtype.xml
+++ b/docs/reference/gobject/tut_gtype.xml
@@ -306,7 +306,7 @@ GType maman_bar_get_type (void)
{
static GType type = 0;
if (type == 0) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
/* You fill this structure. */
};
type = g_type_register_static (G_TYPE_OBJECT,
@@ -419,7 +419,7 @@ maman_bar_get_type (void)
{
static GType type = 0;
if (type == 0) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (MamanBarClass),
NULL, /* base_init */
NULL, /* base_finalize */
@@ -723,7 +723,7 @@ maman_baz_get_type (void)
{
static GType type = 0;
if (type == 0) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (MamanBazInterface),
NULL, /* base_init */
NULL, /* base_finalize */
@@ -734,7 +734,7 @@ maman_baz_get_type (void)
0, /* n_preallocs */
NULL /* instance_init */
};
- static const GInterfaceInfo ibaz_info = {
+ const GInterfaceInfo ibaz_info = {
(GInterfaceInitFunc) baz_interface_init, /* interface_init */
NULL, /* interface_finalize */
NULL /* interface_data */
diff --git a/docs/reference/gobject/tut_howto.xml b/docs/reference/gobject/tut_howto.xml
index 319d951..0c89614 100644
--- a/docs/reference/gobject/tut_howto.xml
+++ b/docs/reference/gobject/tut_howto.xml
@@ -872,7 +872,7 @@ maman_ibaz_get_type (void)
static GType iface_type = 0;
if (iface_type == 0)
{
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (MamanIbazInterface),
maman_ibaz_base_init, /* base_init */
NULL, /* base_finalize */
diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index e3a6170..e246e53 100644
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -114,7 +114,7 @@ value_free (gpointer boxed)
void
g_boxed_type_init (void)
{
- static const GTypeInfo info = {
+ const GTypeInfo info = {
0, /* class_size */
NULL, /* base_init */
NULL, /* base_destroy */
@@ -429,7 +429,7 @@ g_boxed_type_register_static (const gchar *name,
"p",
boxed_proxy_lcopy_value,
};
- static const GTypeInfo type_info = {
+ const GTypeInfo type_info = {
0, /* class_size */
NULL, /* base_init */
NULL, /* base_finalize */
diff --git a/gobject/genums.c b/gobject/genums.c
index b49cae5..6471785 100644
--- a/gobject/genums.c
+++ b/gobject/genums.c
@@ -90,7 +90,7 @@ g_enum_types_init (void)
"p", /* lcopy_format */
value_flags_enum_lcopy_value, /* lcopy_value */
};
- static GTypeInfo info = {
+ GTypeInfo info = {
0, /* class_size */
NULL, /* base_init */
NULL, /* base_destroy */
diff --git a/gobject/gobject.c b/gobject/gobject.c
index f906d31..2b15969 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -237,7 +237,7 @@ g_object_type_init (void)
static const GTypeFundamentalInfo finfo = {
G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE,
};
- static GTypeInfo info = {
+ GTypeInfo info = {
sizeof (GObjectClass),
(GBaseInitFunc) g_object_base_class_init,
(GBaseFinalizeFunc) g_object_base_class_finalize,
diff --git a/gobject/gparam.c b/gobject/gparam.c
index 139baa0..abe9128 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -105,7 +105,7 @@ g_param_type_init (void)
"p", /* lcopy_format */
value_param_lcopy_value, /* lcopy_value */
};
- static const GTypeInfo param_spec_info = {
+ const GTypeInfo param_spec_info = {
sizeof (GParamSpecClass),
(GBaseInitFunc) g_param_spec_class_base_init,
diff --git a/gobject/gtype.h b/gobject/gtype.h
index 860b518..699f9c3 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -1326,7 +1326,7 @@ gpointer g_type_instance_get_private (GTypeInstance *instance,
* (GInstanceInitFunc) gtk_gadget_init,
* (GTypeFlags) flags);
* {
- * static const GInterfaceInfo g_implement_interface_info = {
+ * const GInterfaceInfo g_implement_interface_info = {
* (GInterfaceInitFunc) gtk_gadget_gizmo_init
* };
* g_type_add_interface_static (g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c
index 1ba64ad..90a39ac 100644
--- a/gobject/gtypemodule.c
+++ b/gobject/gtypemodule.c
@@ -154,7 +154,7 @@ g_type_module_get_type (void)
if (!type_module_type)
{
- static const GTypeInfo type_module_info = {
+ const GTypeInfo type_module_info = {
sizeof (GTypeModuleClass),
NULL, /* base_init */
NULL, /* base_finalize */
@@ -165,7 +165,7 @@ g_type_module_get_type (void)
0, /* n_preallocs */
NULL, /* instance_init */
};
- static const GInterfaceInfo iface_info = {
+ const GInterfaceInfo iface_info = {
(GInterfaceInitFunc) g_type_module_iface_init,
NULL, /* interface_finalize */
NULL, /* interface_data */
diff --git a/gobject/gtypeplugin.c b/gobject/gtypeplugin.c
index 3dbd13e..54f2797 100644
--- a/gobject/gtypeplugin.c
+++ b/gobject/gtypeplugin.c
@@ -96,7 +96,7 @@ g_type_plugin_get_type (void)
if (!type_plugin_type)
{
- static const GTypeInfo type_plugin_info = {
+ const GTypeInfo type_plugin_info = {
sizeof (GTypePluginClass),
NULL, /* base_init */
NULL, /* base_finalize */
diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c
index 5713e48..f0929fd 100644
--- a/gobject/gvaluetypes.c
+++ b/gobject/gvaluetypes.c
@@ -1057,7 +1057,7 @@ g_value_get_pointer (const GValue *value)
GType
g_gtype_get_type (void)
{
- static const GTypeInfo type_info = { 0, };
+ const GTypeInfo type_info = { 0, };
static GType type;
if (!type)
type = g_type_register_static (G_TYPE_POINTER, g_intern_static_string ("GType"), &type_info, 0);
@@ -1186,7 +1186,7 @@ g_strdup_value_contents (const GValue *value)
GType
g_pointer_type_register_static (const gchar *name)
{
- static const GTypeInfo type_info = {
+ const GTypeInfo type_info = {
0, /* class_size */
NULL, /* base_init */
NULL, /* base_finalize */
diff --git a/gobject/testgobject.c b/gobject/testgobject.c
index 2723764..601dddb 100644
--- a/gobject/testgobject.c
+++ b/gobject/testgobject.c
@@ -47,7 +47,7 @@ test_iface_get_type (void)
if (!test_iface_type)
{
- static const GTypeInfo test_iface_info =
+ const GTypeInfo test_iface_info =
{
sizeof (TestIfaceClass),
(GBaseInitFunc) iface_base_init, /* base_init */
@@ -163,7 +163,7 @@ test_object_get_type (void)
if (!test_object_type)
{
- static const GTypeInfo test_object_info =
+ const GTypeInfo test_object_info =
{
sizeof (TestObjectClass),
NULL, /* base_init */
@@ -327,7 +327,7 @@ derived_object_get_type (void)
if (!derived_object_type)
{
- static const GTypeInfo derived_object_info =
+ const GTypeInfo derived_object_info =
{
sizeof (DerivedObjectClass),
NULL, /* base_init */
diff --git a/tests/gobject/defaultiface.c b/tests/gobject/defaultiface.c
index 2ebe890..ece9259 100644
--- a/tests/gobject/defaultiface.c
+++ b/tests/gobject/defaultiface.c
@@ -117,7 +117,7 @@ test_dynamic_iface_default_finalize (TestStaticIfaceClass *iface)
static void
test_dynamic_iface_register (GTypeModule *module)
{
- static const GTypeInfo iface_info =
+ const GTypeInfo iface_info =
{
sizeof (TestDynamicIfaceClass),
(GBaseInitFunc) NULL,
diff --git a/tests/gobject/deftype.c b/tests/gobject/deftype.c
index 924e7ad..b6aabb4 100644
--- a/tests/gobject/deftype.c
+++ b/tests/gobject/deftype.c
@@ -21,7 +21,7 @@
/* see http://bugzilla.gnome.org/show_bug.cgi?id=337128 for the purpose of this test */
#define MY_G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init) { \
- static const GInterfaceInfo g_implement_interface_info = { \
+ const GInterfaceInfo g_implement_interface_info = { \
(GInterfaceInitFunc) iface_init, \
NULL, \
NULL \
diff --git a/tests/gobject/ifacecheck.c b/tests/gobject/ifacecheck.c
index f57189a..86ce2e2 100644
--- a/tests/gobject/ifacecheck.c
+++ b/tests/gobject/ifacecheck.c
@@ -151,7 +151,7 @@ main (int argc,
*/
g_type_class_ref (TEST_TYPE_OBJECT4);
{
- static GInterfaceInfo const iface = {
+ GInterfaceInfo const iface = {
NULL, NULL, NULL
};
diff --git a/tests/gobject/ifaceinit.c b/tests/gobject/ifaceinit.c
index eaa6d35..9715c95 100644
--- a/tests/gobject/ifaceinit.c
+++ b/tests/gobject/ifaceinit.c
@@ -160,7 +160,7 @@ struct _TestObjectClass
} G_STMT_END
#define ADD_IFACE(n) G_STMT_START { \
- static GInterfaceInfo iface_info = { \
+ GInterfaceInfo iface_info = { \
(GInterfaceInitFunc)test_object_test_iface##n##_init, \
NULL, NULL }; \
\
diff --git a/tests/gobject/testcommon.h b/tests/gobject/testcommon.h
index 7bfef05..6c377e4 100644
--- a/tests/gobject/testcommon.h
+++ b/tests/gobject/testcommon.h
@@ -32,7 +32,7 @@ prefix ## _get_type (void) \
\
if (!object_type) \
{ \
- static const GTypeInfo object_info = \
+ const GTypeInfo object_info = \
{ \
sizeof (name ## Class), \
(GBaseInitFunc) base_init, \
@@ -68,7 +68,7 @@ prefix ## _get_type (void) \
\
if (!iface_type) \
{ \
- static const GTypeInfo iface_info = \
+ const GTypeInfo iface_info = \
{ \
sizeof (name ## Class), \
(GBaseInitFunc) base_init, \
@@ -85,7 +85,7 @@ prefix ## _get_type (void) \
#define INTERFACE_FULL(type, init_func, iface_type) \
{ \
- static GInterfaceInfo const iface = \
+ GInterfaceInfo const iface = \
{ \
(GInterfaceInitFunc) init_func, NULL, NULL \
}; \
diff --git a/tests/refcount/objects.c b/tests/refcount/objects.c
index 9638045..483a8b2 100644
--- a/tests/refcount/objects.c
+++ b/tests/refcount/objects.c
@@ -37,7 +37,7 @@ my_test_get_type (void)
static GType test_type = 0;
if (!test_type) {
- static const GTypeInfo test_info = {
+ const GTypeInfo test_info = {
sizeof (GTestClass),
NULL,
NULL,
diff --git a/tests/refcount/objects2.c b/tests/refcount/objects2.c
index bbd4a82..3218a96 100644
--- a/tests/refcount/objects2.c
+++ b/tests/refcount/objects2.c
@@ -36,7 +36,7 @@ my_test_get_type (void)
static GType test_type = 0;
if (!test_type) {
- static const GTypeInfo test_info = {
+ const GTypeInfo test_info = {
sizeof (GTestClass),
NULL,
NULL,
diff --git a/tests/refcount/properties.c b/tests/refcount/properties.c
index c4c165c..64ab071 100644
--- a/tests/refcount/properties.c
+++ b/tests/refcount/properties.c
@@ -54,7 +54,7 @@ my_test_get_type (void)
static GType test_type = 0;
if (!test_type) {
- static const GTypeInfo test_info = {
+ const GTypeInfo test_info = {
sizeof (GTestClass),
NULL,
NULL,
diff --git a/tests/refcount/properties2.c b/tests/refcount/properties2.c
index bb79105..2cfa883 100644
--- a/tests/refcount/properties2.c
+++ b/tests/refcount/properties2.c
@@ -51,7 +51,7 @@ my_test_get_type (void)
static GType test_type = 0;
if (!test_type) {
- static const GTypeInfo test_info = {
+ const GTypeInfo test_info = {
sizeof (GTestClass),
NULL,
NULL,
diff --git a/tests/refcount/signals.c b/tests/refcount/signals.c
index 1a2a2ba..5758fb8 100644
--- a/tests/refcount/signals.c
+++ b/tests/refcount/signals.c
@@ -68,7 +68,7 @@ my_test_get_type (void)
static GType test_type = 0;
if (!test_type) {
- static const GTypeInfo test_info = {
+ const GTypeInfo test_info = {
sizeof (GTestClass),
NULL,
NULL,
--
1.6.5.2
>From d21a0cee93767c3a07e5fd1e27e1afa39fd6b49b Mon Sep 17 00:00:00 2001
From: Nicola Fontana <n...@entidi.it>
Date: Mon, 26 Oct 2009 20:29:31 +0100
Subject: [PATCH] Do not use static GTypeInfo and GInterfaceInfo
Either g_type_register_static_simple (used by G_DEFINE_TYPE_EXTENDED)
and G_IMPLEMENT_INTERFACE use automatic variables for GTypeInfo and
GInterfaceInfo structs, while tutorials and source code often use
static variables. This commit consistently adopts the former method.
---
docs/tutorial/gtk-tut.sgml | 6 +++---
examples/gtkdial/gtkdial.c | 2 +-
examples/tictactoe/tictactoe.c | 2 +-
gdk-pixbuf/io-ani-animation.c | 4 ++--
gdk-pixbuf/io-gdip-animation.c | 4 ++--
gdk-pixbuf/io-gif-animation.c | 4 ++--
gdk/directfb/gdkcolor-directfb.c | 2 +-
gdk/directfb/gdkdisplay-directfb.c | 2 +-
gdk/directfb/gdkdnd-directfb.c | 2 +-
gdk/directfb/gdkdrawable-directfb.c | 2 +-
gdk/directfb/gdkgc-directfb.c | 2 +-
gdk/directfb/gdkimage-directfb.c | 2 +-
gdk/directfb/gdkinput-directfb.c | 2 +-
gdk/directfb/gdkpixmap-directfb.c | 2 +-
gdk/directfb/gdkvisual-directfb.c | 2 +-
gdk/directfb/gdkwindow-directfb.c | 6 +++---
gdk/quartz/gdkcolor-quartz.c | 2 +-
gdk/quartz/gdkdnd-quartz.c | 2 +-
gdk/quartz/gdkdrawable-quartz.c | 2 +-
gdk/quartz/gdkgc-quartz.c | 2 +-
gdk/quartz/gdkimage-quartz.c | 2 +-
gdk/quartz/gdkinput-old.c | 2 +-
gdk/quartz/gdkinput.c | 2 +-
gdk/quartz/gdkpixmap-quartz.c | 2 +-
gdk/quartz/gdkvisual-quartz.c | 2 +-
gdk/win32/gdkcolor-win32.c | 2 +-
gdk/win32/gdkgc-win32.c | 2 +-
gdk/win32/gdkimage-win32.c | 2 +-
gdk/win32/gdkinput.c | 2 +-
gdk/win32/gdkpixmap-win32.c | 2 +-
gdk/win32/gdkvisual-win32.c | 2 +-
gdk/win32/gdkwindow-win32.c | 2 +-
gdk/x11/gdkinput.c | 2 +-
gdk/x11/gdkkeys-x11.c | 2 +-
gdk/x11/gdkvisual-x11.c | 2 +-
gtk/gtkactiongroup.c | 2 +-
gtk/gtkcontainer.c | 2 +-
gtk/gtkiconview.c | 14 +++++++-------
gtk/gtktext.c | 2 +-
gtk/gtktoolbutton.c | 2 +-
modules/engines/ms-windows/msw_rc_style.c | 2 +-
modules/engines/ms-windows/msw_style.c | 2 +-
modules/engines/pixbuf/pixbuf-draw.c | 2 +-
modules/engines/pixbuf/pixbuf-rc-style.c | 2 +-
modules/input/gtkimcontextime.c | 2 +-
modules/input/gtkimcontextmultipress.c | 2 +-
modules/input/gtkimcontextthai.c | 2 +-
modules/input/gtkimcontextxim.c | 2 +-
modules/input/imam-et.c | 2 +-
modules/input/imcedilla.c | 2 +-
modules/input/imcyrillic-translit.c | 2 +-
modules/input/iminuktitut.c | 2 +-
modules/input/imipa.c | 2 +-
modules/input/imti-er.c | 2 +-
modules/input/imti-et.c | 2 +-
modules/input/imviqr.c | 2 +-
modules/other/gail/libgail-util/gailtextutil.c | 2 +-
modules/printbackends/cups/gtkprintbackendcups.c | 2 +-
modules/printbackends/cups/gtkprintercups.c | 2 +-
modules/printbackends/file/gtkprintbackendfile.c | 2 +-
modules/printbackends/lpr/gtkprintbackendlpr.c | 2 +-
modules/printbackends/papi/gtkprintbackendpapi.c | 2 +-
modules/printbackends/papi/gtkprinterpapi.c | 2 +-
modules/printbackends/test/gtkprintbackendtest.c | 2 +-
tests/testtreecolumns.c | 8 ++++----
tests/testtreeview.c | 4 ++--
66 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index f45f697..9a7c9f1 100755
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -11154,7 +11154,7 @@ tictactoe_get_type (void)
if (!ttt_type)
{
- static const GTypeInfo ttt_info =
+ const GTypeInfo ttt_info =
{
sizeof (TictactoeClass),
NULL, /* base_init */
@@ -14606,7 +14606,7 @@ tictactoe_get_type (void)
if (!ttt_type)
{
- static const GTypeInfo ttt_info =
+ const GTypeInfo ttt_info =
{
sizeof (TictactoeClass),
NULL, /* base_init */
@@ -14963,7 +14963,7 @@ gtk_dial_get_type ()
if (!dial_type)
{
- static const GTypeInfo dial_info =
+ const GTypeInfo dial_info =
{
sizeof (GtkDialClass),
NULL,
diff --git a/examples/gtkdial/gtkdial.c b/examples/gtkdial/gtkdial.c
index 385ed42..4abc184 100644
--- a/examples/gtkdial/gtkdial.c
+++ b/examples/gtkdial/gtkdial.c
@@ -65,7 +65,7 @@ gtk_dial_get_type ()
if (!dial_type)
{
- static const GTypeInfo dial_info =
+ const GTypeInfo dial_info =
{
sizeof (GtkDialClass),
NULL,
diff --git a/examples/tictactoe/tictactoe.c b/examples/tictactoe/tictactoe.c
index 34c7b2f..3385b1f 100644
--- a/examples/tictactoe/tictactoe.c
+++ b/examples/tictactoe/tictactoe.c
@@ -40,7 +40,7 @@ tictactoe_get_type (void)
if (!ttt_type)
{
- static const GTypeInfo ttt_info =
+ const GTypeInfo ttt_info =
{
sizeof (TictactoeClass),
NULL, /* base_init */
diff --git a/gdk-pixbuf/io-ani-animation.c b/gdk-pixbuf/io-ani-animation.c
index b3a236c..fc19b68 100644
--- a/gdk-pixbuf/io-ani-animation.c
+++ b/gdk-pixbuf/io-ani-animation.c
@@ -49,7 +49,7 @@ gdk_pixbuf_ani_anim_get_type (void)
static GType object_type = 0;
if (!object_type) {
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (GdkPixbufAniAnimClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
@@ -191,7 +191,7 @@ gdk_pixbuf_ani_anim_iter_get_type (void)
static GType object_type = 0;
if (!object_type) {
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (GdkPixbufAniAnimIterClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
diff --git a/gdk-pixbuf/io-gdip-animation.c b/gdk-pixbuf/io-gdip-animation.c
index 14cd034..7281b6d 100644
--- a/gdk-pixbuf/io-gdip-animation.c
+++ b/gdk-pixbuf/io-gdip-animation.c
@@ -46,7 +46,7 @@ gdk_pixbuf_gdip_anim_get_type (void)
static GType object_type = 0;
if (!object_type) {
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (GdkPixbufGdipAnimClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
@@ -197,7 +197,7 @@ gdk_pixbuf_gdip_anim_iter_get_type (void)
static GType object_type = 0;
if (!object_type) {
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (GdkPixbufGdipAnimIterClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c
index 580b057..391e928 100644
--- a/gdk-pixbuf/io-gif-animation.c
+++ b/gdk-pixbuf/io-gif-animation.c
@@ -50,7 +50,7 @@ gdk_pixbuf_gif_anim_get_type (void)
static GType object_type = 0;
if (!object_type) {
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (GdkPixbufGifAnimClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
@@ -206,7 +206,7 @@ gdk_pixbuf_gif_anim_iter_get_type (void)
static GType object_type = 0;
if (!object_type) {
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (GdkPixbufGifAnimIterClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c
index 6bd31c3..e3ecdd2 100644
--- a/gdk/directfb/gdkcolor-directfb.c
+++ b/gdk/directfb/gdkcolor-directfb.c
@@ -73,7 +73,7 @@ gdk_colormap_get_type (void)
static GType object_type = 0;
if (!object_type) {
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkColormapClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
index 1b8d245..4483552 100644
--- a/gdk/directfb/gdkdisplay-directfb.c
+++ b/gdk/directfb/gdkdisplay-directfb.c
@@ -140,7 +140,7 @@ gdk_display_dfb_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDisplayDFBClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkdnd-directfb.c b/gdk/directfb/gdkdnd-directfb.c
index 2691279..fdc988f 100644
--- a/gdk/directfb/gdkdnd-directfb.c
+++ b/gdk/directfb/gdkdnd-directfb.c
@@ -123,7 +123,7 @@ gdk_drag_context_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDragContextClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c
index e10f6b1..7e948a8 100644
--- a/gdk/directfb/gdkdrawable-directfb.c
+++ b/gdk/directfb/gdkdrawable-directfb.c
@@ -1568,7 +1568,7 @@ gdk_drawable_impl_directfb_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDrawableImplDirectFBClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkgc-directfb.c b/gdk/directfb/gdkgc-directfb.c
index ef83e85..7348312 100644
--- a/gdk/directfb/gdkgc-directfb.c
+++ b/gdk/directfb/gdkgc-directfb.c
@@ -71,7 +71,7 @@ gdk_gc_directfb_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkGCDirectFBClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkimage-directfb.c b/gdk/directfb/gdkimage-directfb.c
index 7f73ca3..797909f 100644
--- a/gdk/directfb/gdkimage-directfb.c
+++ b/gdk/directfb/gdkimage-directfb.c
@@ -58,7 +58,7 @@ gdk_image_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkImageClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkinput-directfb.c b/gdk/directfb/gdkinput-directfb.c
index 4c780a1..3f44ec0 100644
--- a/gdk/directfb/gdkinput-directfb.c
+++ b/gdk/directfb/gdkinput-directfb.c
@@ -94,7 +94,7 @@ gdk_device_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDeviceClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkpixmap-directfb.c b/gdk/directfb/gdkpixmap-directfb.c
index b83755a..393544a 100644
--- a/gdk/directfb/gdkpixmap-directfb.c
+++ b/gdk/directfb/gdkpixmap-directfb.c
@@ -61,7 +61,7 @@ gdk_pixmap_impl_directfb_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkPixmapImplDirectFBClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkvisual-directfb.c b/gdk/directfb/gdkvisual-directfb.c
index 43ecb83..7ae0831 100644
--- a/gdk/directfb/gdkvisual-directfb.c
+++ b/gdk/directfb/gdkvisual-directfb.c
@@ -88,7 +88,7 @@ gdk_visual_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkVisualClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index 30ec834..eab3f8d 100644
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -92,7 +92,7 @@ gdk_window_impl_directfb_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkWindowImplDirectFBClass),
(GBaseInitFunc) NULL,
@@ -105,14 +105,14 @@ gdk_window_impl_directfb_get_type (void)
(GInstanceInitFunc) gdk_window_impl_directfb_init,
};
- static const GInterfaceInfo paintable_info =
+ const GInterfaceInfo paintable_info =
{
(GInterfaceInitFunc) gdk_window_impl_directfb_paintable_init,
NULL,
NULL
};
- static const GInterfaceInfo window_impl_info =
+ const GInterfaceInfo window_impl_info =
{
(GInterfaceInitFunc) gdk_window_impl_iface_init,
NULL,
diff --git a/gdk/quartz/gdkcolor-quartz.c b/gdk/quartz/gdkcolor-quartz.c
index 7806244..3dbc186 100644
--- a/gdk/quartz/gdkcolor-quartz.c
+++ b/gdk/quartz/gdkcolor-quartz.c
@@ -30,7 +30,7 @@ gdk_colormap_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkColormapClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/quartz/gdkdnd-quartz.c b/gdk/quartz/gdkdnd-quartz.c
index 948b4dd..bb70b71 100644
--- a/gdk/quartz/gdkdnd-quartz.c
+++ b/gdk/quartz/gdkdnd-quartz.c
@@ -59,7 +59,7 @@ gdk_drag_context_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDragContextClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/quartz/gdkdrawable-quartz.c b/gdk/quartz/gdkdrawable-quartz.c
index b4b1e03..2f03f2e 100644
--- a/gdk/quartz/gdkdrawable-quartz.c
+++ b/gdk/quartz/gdkdrawable-quartz.c
@@ -687,7 +687,7 @@ gdk_drawable_impl_quartz_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDrawableImplQuartzClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/quartz/gdkgc-quartz.c b/gdk/quartz/gdkgc-quartz.c
index c4da893..66a4e75 100644
--- a/gdk/quartz/gdkgc-quartz.c
+++ b/gdk/quartz/gdkgc-quartz.c
@@ -169,7 +169,7 @@ _gdk_gc_quartz_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkGCQuartzClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/quartz/gdkimage-quartz.c b/gdk/quartz/gdkimage-quartz.c
index 40b1205..c8e37bc 100644
--- a/gdk/quartz/gdkimage-quartz.c
+++ b/gdk/quartz/gdkimage-quartz.c
@@ -202,7 +202,7 @@ gdk_image_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkImageClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/quartz/gdkinput-old.c b/gdk/quartz/gdkinput-old.c
index ad636ca..3ed0609 100644
--- a/gdk/quartz/gdkinput-old.c
+++ b/gdk/quartz/gdkinput-old.c
@@ -29,7 +29,7 @@ gdk_device_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDeviceClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/quartz/gdkinput.c b/gdk/quartz/gdkinput.c
index 657d435..7cb9b35 100644
--- a/gdk/quartz/gdkinput.c
+++ b/gdk/quartz/gdkinput.c
@@ -83,7 +83,7 @@ gdk_device_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDeviceClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/quartz/gdkpixmap-quartz.c b/gdk/quartz/gdkpixmap-quartz.c
index a743480..5818d7c 100644
--- a/gdk/quartz/gdkpixmap-quartz.c
+++ b/gdk/quartz/gdkpixmap-quartz.c
@@ -102,7 +102,7 @@ _gdk_pixmap_impl_quartz_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkPixmapImplQuartzClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/quartz/gdkvisual-quartz.c b/gdk/quartz/gdkvisual-quartz.c
index a1d62d1..b6dace5 100644
--- a/gdk/quartz/gdkvisual-quartz.c
+++ b/gdk/quartz/gdkvisual-quartz.c
@@ -47,7 +47,7 @@ gdk_visual_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkVisualClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c
index 546c91a..60a8464 100644
--- a/gdk/win32/gdkcolor-win32.c
+++ b/gdk/win32/gdkcolor-win32.c
@@ -51,7 +51,7 @@ gdk_colormap_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkColormapClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index c4e234f..62f7929 100644
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -60,7 +60,7 @@ _gdk_gc_win32_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkGCWin32Class),
(GBaseInitFunc) NULL,
diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c
index 4359183..5292f20 100644
--- a/gdk/win32/gdkimage-win32.c
+++ b/gdk/win32/gdkimage-win32.c
@@ -46,7 +46,7 @@ gdk_image_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkImageClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c
index ddf1d91..87862f1 100644
--- a/gdk/win32/gdkinput.c
+++ b/gdk/win32/gdkinput.c
@@ -73,7 +73,7 @@ gdk_device_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDeviceClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index d231cbd..1ee3f1e 100644
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -53,7 +53,7 @@ _gdk_pixmap_impl_win32_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkPixmapImplWin32Class),
(GBaseInitFunc) NULL,
diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c
index cd26acd..440f6ce 100644
--- a/gdk/win32/gdkvisual-win32.c
+++ b/gdk/win32/gdkvisual-win32.c
@@ -61,7 +61,7 @@ gdk_visual_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkVisualClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index e472b91..860e29b 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -70,7 +70,7 @@ _gdk_window_impl_win32_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkWindowImplWin32Class),
(GBaseInitFunc) NULL,
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index 25f93dc..4cd2406 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -75,7 +75,7 @@ gdk_device_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkDeviceClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 002341b..bcd3258 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -119,7 +119,7 @@ gdk_keymap_x11_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkKeymapClass),
(GBaseInitFunc) NULL,
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 593e3ba..6d827c9 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -70,7 +70,7 @@ gdk_visual_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GdkVisualClass),
(GBaseInitFunc) NULL,
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 2794c58..2fd87e0 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -131,7 +131,7 @@ gtk_action_group_get_type (void)
(GInstanceInitFunc) gtk_action_group_init,
};
- static const GInterfaceInfo buildable_info =
+ const GInterfaceInfo buildable_info =
{
(GInterfaceInitFunc) gtk_action_group_buildable_init,
NULL,
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 6563af9..8b721d0 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -155,7 +155,7 @@ gtk_container_get_type (void)
NULL, /* value_table */
};
- static const GInterfaceInfo buildable_info =
+ const GInterfaceInfo buildable_info =
{
(GInterfaceInitFunc) gtk_container_buildable_init,
NULL,
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 7bfbaa5..ef82ef8 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -8763,25 +8763,25 @@ gtk_icon_view_item_accessible_get_type (void)
NULL /* value table */
};
- static const GInterfaceInfo atk_component_info =
+ const GInterfaceInfo atk_component_info =
{
(GInterfaceInitFunc) atk_component_item_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_action_info =
+ const GInterfaceInfo atk_action_info =
{
(GInterfaceInitFunc) atk_action_item_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_image_info =
+ const GInterfaceInfo atk_image_info =
{
(GInterfaceInitFunc) atk_image_item_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_text_info =
+ const GInterfaceInfo atk_text_info =
{
(GInterfaceInitFunc) atk_text_item_interface_init,
(GInterfaceFinalizeFunc) NULL,
@@ -9706,7 +9706,7 @@ gtk_icon_view_accessible_get_type (void)
if (!type)
{
- static GTypeInfo tinfo =
+ GTypeInfo tinfo =
{
0, /* class size */
(GBaseInitFunc) NULL, /* base init */
@@ -9719,13 +9719,13 @@ gtk_icon_view_accessible_get_type (void)
(GInstanceInitFunc) NULL, /* instance init */
NULL /* value table */
};
- static const GInterfaceInfo atk_component_info =
+ const GInterfaceInfo atk_component_info =
{
(GInterfaceInitFunc) atk_component_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_selection_info =
+ const GInterfaceInfo atk_selection_info =
{
(GInterfaceInitFunc) gtk_icon_view_accessible_selection_interface_init,
(GInterfaceFinalizeFunc) NULL,
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 44e7e0f..b853eab 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -471,7 +471,7 @@ gtk_text_get_type (void)
(GtkClassInitFunc) NULL,
};
- static const GInterfaceInfo editable_info =
+ const GInterfaceInfo editable_info =
{
(GInterfaceInitFunc) gtk_text_editable_init, /* interface_init */
NULL, /* interface_finalize */
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 6db8358..b9f5b7b 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -114,7 +114,7 @@ gtk_tool_button_get_type (void)
if (!type)
{
- static const GInterfaceInfo activatable_info =
+ const GInterfaceInfo activatable_info =
{
(GInterfaceInitFunc) gtk_tool_button_activatable_interface_init,
(GInterfaceFinalizeFunc) NULL,
diff --git a/modules/engines/ms-windows/msw_rc_style.c b/modules/engines/ms-windows/msw_rc_style.c
index b80f713..62c29ad 100755
--- a/modules/engines/ms-windows/msw_rc_style.c
+++ b/modules/engines/ms-windows/msw_rc_style.c
@@ -34,7 +34,7 @@ GType msw_type_rc_style = 0;
void
msw_rc_style_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (MswRcStyleClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index a21494b..27f8594 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -3745,7 +3745,7 @@ GType msw_type_style = 0;
void
msw_style_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (MswStyleClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index dec14e5..38f2761 100644
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -1058,7 +1058,7 @@ GType pixbuf_type_style = 0;
void
pixbuf_style_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (PixbufStyleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index af6490a..a3367c4 100644
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -140,7 +140,7 @@ GType pixbuf_type_rc_style = 0;
void
pixbuf_rc_style_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (PixbufRcStyleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index 5322b34..84fd1e0 100644
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -124,7 +124,7 @@ static GObjectClass *parent_class;
void
gtk_im_context_ime_register_type (GTypeModule *type_module)
{
- static const GTypeInfo im_context_ime_info = {
+ const GTypeInfo im_context_ime_info = {
sizeof (GtkIMContextIMEClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
diff --git a/modules/input/gtkimcontextmultipress.c b/modules/input/gtkimcontextmultipress.c
index 9472098..7c2a228 100644
--- a/modules/input/gtkimcontextmultipress.c
+++ b/modules/input/gtkimcontextmultipress.c
@@ -63,7 +63,7 @@ static void vfunc_get_preedit_string (GtkIMContext *context,
void
gtk_im_context_multipress_register_type (GTypeModule* type_module)
{
- static const GTypeInfo im_context_multipress_info =
+ const GTypeInfo im_context_multipress_info =
{
sizeof (GtkImContextMultipressClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/gtkimcontextthai.c b/modules/input/gtkimcontextthai.c
index 640c013..5592a1e 100644
--- a/modules/input/gtkimcontextthai.c
+++ b/modules/input/gtkimcontextthai.c
@@ -43,7 +43,7 @@ GType gtk_type_im_context_thai = 0;
void
gtk_im_context_thai_register_type (GTypeModule *type_module)
{
- static const GTypeInfo im_context_thai_info =
+ const GTypeInfo im_context_thai_info =
{
sizeof (GtkIMContextThaiClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index a9e584c..cefbf60 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -158,7 +158,7 @@ static GSList *status_windows = NULL;
void
gtk_im_context_xim_register_type (GTypeModule *type_module)
{
- static const GTypeInfo im_context_xim_info =
+ const GTypeInfo im_context_xim_info =
{
sizeof (GtkIMContextXIMClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c
index 6e910a9..f989ca4 100644
--- a/modules/input/imam-et.c
+++ b/modules/input/imam-et.c
@@ -43,7 +43,7 @@ static void am_et_init (GtkIMContextSimple *im_context);
static void
am_et_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkIMContextSimpleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/imcedilla.c b/modules/input/imcedilla.c
index 98db8e8..59c4498 100644
--- a/modules/input/imcedilla.c
+++ b/modules/input/imcedilla.c
@@ -38,7 +38,7 @@ static void cedilla_init (GtkIMContextSimple *im_context);
static void
cedilla_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkIMContextSimpleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index aac8d40..ef4c7de 100644
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -37,7 +37,7 @@ static void cyrillic_translit_init (GtkIMContextSimple *im_context);
static void
cyrillic_translit_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkIMContextSimpleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c
index 38a0398..d727da7 100644
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -40,7 +40,7 @@ static void inuktitut_init (GtkIMContextSimple *im_context);
static void
inuktitut_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkIMContextSimpleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/imipa.c b/modules/input/imipa.c
index 900dc0b..b526d8f 100644
--- a/modules/input/imipa.c
+++ b/modules/input/imipa.c
@@ -37,7 +37,7 @@ static void ipa_init (GtkIMContextSimple *im_context);
static void
ipa_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkIMContextSimpleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c
index ea1da49..ad62344 100644
--- a/modules/input/imti-er.c
+++ b/modules/input/imti-er.c
@@ -43,7 +43,7 @@ static void ti_er_init (GtkIMContextSimple *im_context);
static void
ti_er_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkIMContextSimpleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c
index 7834803..663c7e2 100644
--- a/modules/input/imti-et.c
+++ b/modules/input/imti-et.c
@@ -43,7 +43,7 @@ static void ti_et_init (GtkIMContextSimple *im_context);
static void
ti_et_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkIMContextSimpleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c
index 0c007ff..5994894 100644
--- a/modules/input/imviqr.c
+++ b/modules/input/imviqr.c
@@ -40,7 +40,7 @@ static void viqr_init (GtkIMContextSimple *im_context);
static void
viqr_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkIMContextSimpleClass),
(GBaseInitFunc) NULL,
diff --git a/modules/other/gail/libgail-util/gailtextutil.c b/modules/other/gail/libgail-util/gailtextutil.c
index ae6234f..5ef7f69 100644
--- a/modules/other/gail/libgail-util/gailtextutil.c
+++ b/modules/other/gail/libgail-util/gailtextutil.c
@@ -46,7 +46,7 @@ gail_text_util_get_type(void)
if (!type)
{
- static const GTypeInfo tinfo =
+ const GTypeInfo tinfo =
{
sizeof (GailTextUtilClass),
(GBaseInitFunc) NULL, /* base init */
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 7fd3984..4b378cb 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -193,7 +193,7 @@ static gboolean request_auth_info (gpointer
static void
gtk_print_backend_cups_register_type (GTypeModule *module)
{
- static const GTypeInfo print_backend_cups_info =
+ const GTypeInfo print_backend_cups_info =
{
sizeof (GtkPrintBackendCupsClass),
NULL, /* base_init */
diff --git a/modules/printbackends/cups/gtkprintercups.c b/modules/printbackends/cups/gtkprintercups.c
index ddf4d1d..09818c3 100644
--- a/modules/printbackends/cups/gtkprintercups.c
+++ b/modules/printbackends/cups/gtkprintercups.c
@@ -30,7 +30,7 @@ static GType gtk_printer_cups_type = 0;
void
gtk_printer_cups_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkPrinterCupsClass),
(GBaseInitFunc) NULL,
diff --git a/modules/printbackends/file/gtkprintbackendfile.c b/modules/printbackends/file/gtkprintbackendfile.c
index fc2046c..2d86bd5 100644
--- a/modules/printbackends/file/gtkprintbackendfile.c
+++ b/modules/printbackends/file/gtkprintbackendfile.c
@@ -109,7 +109,7 @@ static GtkPageSetup * file_printer_get_default_page_size (GtkPrinter
static void
gtk_print_backend_file_register_type (GTypeModule *module)
{
- static const GTypeInfo print_backend_file_info =
+ const GTypeInfo print_backend_file_info =
{
sizeof (GtkPrintBackendFileClass),
NULL, /* base_init */
diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c
index 72d9c33..f2de97d 100644
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c
@@ -88,7 +88,7 @@ static void gtk_print_backend_lpr_print_stream (GtkPrintBacke
static void
gtk_print_backend_lpr_register_type (GTypeModule *module)
{
- static const GTypeInfo print_backend_lpr_info =
+ const GTypeInfo print_backend_lpr_info =
{
sizeof (GtkPrintBackendLprClass),
NULL, /* base_init */
diff --git a/modules/printbackends/papi/gtkprintbackendpapi.c b/modules/printbackends/papi/gtkprintbackendpapi.c
index 7dba533..d349010 100644
--- a/modules/printbackends/papi/gtkprintbackendpapi.c
+++ b/modules/printbackends/papi/gtkprintbackendpapi.c
@@ -105,7 +105,7 @@ static void papi_display_printer_status_done (gpointer use
static void
gtk_print_backend_papi_register_type (GTypeModule *module)
{
- static const GTypeInfo print_backend_papi_info =
+ const GTypeInfo print_backend_papi_info =
{
sizeof (GtkPrintBackendPapiClass),
NULL, /* base_init */
diff --git a/modules/printbackends/papi/gtkprinterpapi.c b/modules/printbackends/papi/gtkprinterpapi.c
index 387bc30..979c428 100644
--- a/modules/printbackends/papi/gtkprinterpapi.c
+++ b/modules/printbackends/papi/gtkprinterpapi.c
@@ -31,7 +31,7 @@ static GType gtk_printer_papi_type = 0;
void
gtk_printer_papi_register_type (GTypeModule *module)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkPrinterPapiClass),
(GBaseInitFunc) NULL,
diff --git a/modules/printbackends/test/gtkprintbackendtest.c b/modules/printbackends/test/gtkprintbackendtest.c
index c4a4e23..44912c0 100644
--- a/modules/printbackends/test/gtkprintbackendtest.c
+++ b/modules/printbackends/test/gtkprintbackendtest.c
@@ -107,7 +107,7 @@ static void test_printer_request_details (GtkPrinter
static void
gtk_print_backend_test_register_type (GTypeModule *module)
{
- static const GTypeInfo print_backend_test_info =
+ const GTypeInfo print_backend_test_info =
{
sizeof (GtkPrintBackendTestClass),
NULL, /* base_init */
diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 213836e..b8358f5 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -374,7 +374,7 @@ view_column_model_get_type (void)
if (!view_column_model_type)
{
- static const GTypeInfo view_column_model_info =
+ const GTypeInfo view_column_model_info =
{
sizeof (GtkListStoreClass),
NULL, /* base_init */
@@ -387,21 +387,21 @@ view_column_model_get_type (void)
(GInstanceInitFunc) view_column_model_init,
};
- static const GInterfaceInfo tree_model_info =
+ const GInterfaceInfo tree_model_info =
{
(GInterfaceInitFunc) view_column_model_tree_model_init,
NULL,
NULL
};
- static const GInterfaceInfo drag_source_info =
+ const GInterfaceInfo drag_source_info =
{
(GInterfaceInitFunc) view_column_model_drag_source_init,
NULL,
NULL
};
- static const GInterfaceInfo drag_dest_info =
+ const GInterfaceInfo drag_dest_info =
{
(GInterfaceInitFunc) view_column_model_drag_dest_init,
NULL,
diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 8ee688a..f4552d8 100644
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -891,7 +891,7 @@ gtk_tree_model_types_get_type (void)
if (!model_types_type)
{
- static const GTypeInfo model_types_info =
+ const GTypeInfo model_types_info =
{
sizeof (GtkTreeModelTypesClass),
NULL, /* base_init */
@@ -904,7 +904,7 @@ gtk_tree_model_types_get_type (void)
(GInstanceInitFunc) gtk_tree_model_types_init
};
- static const GInterfaceInfo tree_model_info =
+ const GInterfaceInfo tree_model_info =
{
(GInterfaceInitFunc) gtk_tree_model_types_tree_model_init,
NULL,
--
1.6.5.2
_______________________________________________
gtk-devel-list mailing list
gtk-devel-list@gnome.org
http://mail.gnome.org/mailman/listinfo/gtk-devel-list
