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.

https://bugzilla.gnome.org/show_bug.cgi?id=600158

diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index f45f6972f00faa2a0ef058468b229aabf3495d01..9a7c9f1c11b2c44601ddc768b4bc63215bec0015 100755 (executable)
--- 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 385ed420f44b2bda55885e380f0f14552ccf412e..4abc18472ef433da0cebaabc0fa9a67bfa8e37b5 100644 (file)
--- 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 34c7b2f05e910041af83d2cf16be5cd64b08199f..3385b1fa0d1800b2294cae069386839b1420743e 100644 (file)
--- 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 b3a236cb85096c821650b98d9d65e2a08ffcb0cf..fc19b686664cbcc055f52d566581f09c6989433a 100644 (file)
--- 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 14cd034bc202a07806b2b076fb1dbf1176d29fab..7281b6d115ec007e9c36aec326e0762c1ac75439 100644 (file)
--- 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 580b0575289ec41b0862b07beecadcc1363d3fc5..391e9285032234aabdddf30ce54bde7243ba87f2 100644 (file)
--- 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 6bd31c34191d7ef4bbb2562511005aa12b71ea3b..e3ecdd24b4e25e9aaa86ab74c0b03bc8a2b4dfa7 100644 (file)
--- 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 1b8d2456f2a150694c86366ff93a8ac55eab7fe7..448355229ecdbab9cf2561d0f6f25525af4f60fa 100644 (file)
--- 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 6569105c265cac45edcac6ea7d4c584b020d1114..a106de818c875435bffe56396166766a17f3022f 100644 (file)
--- 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 7e26c8d21b3887a4c4f1a7de4683052faf2d44bd..9fdad15028e20d836c0ef636397b2a1281433bf1 100644 (file)
--- 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 ef83e85ace5e7e3a982ea0f7c11900d076a6818f..7348312006d9cc46e0f3c8b34a98fbf9af56b3c2 100644 (file)
--- 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 a6bee05050d66976b187288e5ea133a2b6e617ad..0485dfdb18830275c486fa78f4aad188403648e6 100644 (file)
--- 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 9fbe3a63e63a66e8edd4a0fcc292c82f96656175..00e0b4343d267f7b87be98afa572ba40d207f9ea 100644 (file)
--- 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 7e45ba0afefb3a3887b00ddf08fe6ddd5cea0103..c1134cc75c43c429b7aa5d8d10578e1167eeab3d 100644 (file)
--- 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 43ecb83b4dcc94ec2c0a31098a1bac6347e7673f..7ae08312bfcb54b0d23c05272f2317ab8f3c007d 100644 (file)
--- 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 61c9bace6acacc2ad4c7b4a3ef2d0c89eef8d728..169039447101b31703bdd86932ada72685084867 100644 (file)
--- 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 78062440c583129e82fa534e2f5f6c64aa2febf8..3dbc186f25836b54d99b4b0f53288ce775ebfb42 100644 (file)
--- 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 948b4dd39a3327c1a037310d4a31489ac58c03fb..bb70b710fc360bed6756e0a0dd01868f97492a7e 100644 (file)
--- 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 b4b1e0364a7e6f5f71752747c9558c29ba565af8..2f03f2eecd1f239e5069085848421ce17e597ef0 100644 (file)
--- 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 c4da89328cdf7be4b2fb76346cc5658f3d89b23c..66a4e759b67e9bf8eb31e4e088e180529829a395 100644 (file)
--- 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 40b120563a85e2c1d4a52ab2be82098c04d172ab..c8e37bcbaa079766000c616f36f300cf54b0ff4a 100644 (file)
--- 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 ad636ca5faa201303798f540caf5c01dd9769be3..3ed0609d5a48c6c74b5d01ea894ec7054d4d927c 100644 (file)
--- 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 ea6cdca1e905a3b5e5bfca9b3603d7a37c46a441..d05638cea998668f7983a82d7b7fa854a2b446ec 100644 (file)
--- 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 a74348089da72680af9c9ad05a6efac05c5bd810..5818d7c860eea632bbf7e4d851952567543c12e9 100644 (file)
--- 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 a1d62d10a3f347d4713645ef8ccb82e3f722350e..b6dace565d841b9c627433268f0f297dd9e541ce 100644 (file)
--- 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 546c91a6411fd2a26d148a0b0b81f49e19bd2b4b..60a8464c1f826754eed31344997b4fd5dd742656 100644 (file)
--- 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 c4e234f4c1a32fa2d890cbc13597136dc33f9673..62f79292b6794a8fb6566b14d2201319e1d49297 100644 (file)
--- 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 4359183b9b79fa9cfae8a89569981827c2aee62f..5292f20622a08f70a1a7f05be810f72b67318c47 100644 (file)
--- 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 ddf1d91e7f24ac6d846d3732e08528abb40e0b08..87862f1915baed264a4ffcc2be502a14f1d1fcde 100644 (file)
--- 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 d231cbd106fc30c333f482085a27ca984be49904..1ee3f1ec1e92dab4c7f0739cf91ea588a3de9b9f 100644 (file)
--- 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 cd26acde9602fab98ac6e898193a962bd7e0a51b..440f6ce84428ec3ffcd4a29039b272c5f6a23d17 100644 (file)
--- 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 894268810299b9825e9812b4965338ccf248533d..b859efc8186f5777c6265c68db970d4d8cc9b0f0 100644 (file)
--- 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 25f93dc28d995b231797008865178905e6dcf7db..4cd2406c02e920affbb7fa14e095e847c1d34807 100644 (file)
--- 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 18952968fc099916d2f9201d708bfce153b1a2d7..01d2a182e5eeb76500dce39ab504116ba317be2e 100644 (file)
--- 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 593e3bab816079938dc06e8c4df2cb80747e417c..6d827c9ed2ce3ac737e0a90da18f3df0d7b33aaf 100644 (file)
--- 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 2794c58008f3964d04c3a2ab498ab7d626e39b3e..2fd87e0969e5ba892eb5e6774d7df3784f1f320f 100644 (file)
--- 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 6563af965fdd509920b0d7541e8e959a6af725e3..8b721d0282d929b0d533be010e60944912daceff 100644 (file)
--- 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 bb6ba2910086b31b0cd560206aaf1942cf0ae458..95dd72d6752413d69b4bfdc29d491e5c89cbb06b 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -8768,25 +8768,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,
@@ -9711,7 +9711,7 @@ gtk_icon_view_accessible_get_type (void)
 
   if (!type)
     {
-      static GTypeInfo tinfo =
+      GTypeInfo tinfo =
       {
         0, /* class size */
         (GBaseInitFunc) NULL, /* base init */
@@ -9724,13 +9724,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 ddf5e205f3b48495920d937bcc5d315417d800ef..24f3b77e5a82a6fdb695284551c501e75614ab42 100644 (file)
--- 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 5975a5168937c3fb32b4abc4a906466f3d30b10f..8875b6d6e6d65f0ac95abd5fcc2480160aa1aa28 100644 (file)
--- 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 b80f71332aa30970ebe4b07d5d3e826b39ecd6da..62c29adca159a126544f9b62986fa9228b7f266c 100755 (executable)
--- 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 a21494b29874b281d46153ad5567c8adefa3a792..27f85947fc8bd9fb681cf0b4f307ad135cc355f2 100755 (executable)
--- 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 dec14e5be155547b25755da88d52aea069989106..38f2761232fd12f8d493eed6419efee4fd100874 100644 (file)
--- 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 af6490aac03dff082c38998f5d095b72de2c9bd6..a3367c4a0e0e2eed6b075d7cb2ac761c2806b1cd 100644 (file)
--- 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 5322b342e0bb9e97ff07e31ac34026a0a3b245b7..84fd1e0c8319c15aefdd5912f769be989e83122f 100644 (file)
--- 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 947209810d3e3f8dafcab3197b538b3904e7a5ad..7c2a2282e748245d05c1891940d9eb5b9479c50e 100644 (file)
--- 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 640c013c5fedbe2ea0e20a3be2bd0a44985d863c..5592a1ebf0698141e1552c36ddcfcc67aeef3323 100644 (file)
--- 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 a9e584c5ca6972ce10b6f4e0773fac3038e7c8db..cefbf609b48e8ce1dbb93ba76a8b908ba2acfd31 100644 (file)
--- 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 6e910a997246ef8af3f5d67c26092d85b7966ae1..f989ca4c46bbaec218d9b845916a6692b3f21a5b 100644 (file)
--- 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 98db8e8f3fe0a8445ea0b6753294e33897c11536..59c4498d575c9b0b09b7b775b0c80719dca8afb2 100644 (file)
--- 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 aac8d40396a3231af2134ee2d7d75c1a92e7a28f..ef4c7decbe016c0d18fd1bda43847620d9a2d625 100644 (file)
--- 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 38a03988a09716b3611f17c0a8adc300a598e1af..d727da743e37e3bbde71d61ce630d7fa1c19a827 100644 (file)
--- 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 900dc0b81fb2f056000d0b2eb469ba086463c4db..b526d8f4028380d848f03a3ccf74af49f47f307c 100644 (file)
--- 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 ea1da49475640a2863707d7565a7f7022ba08ea0..ad623448c77a698f5b29899117ed71933cdd736b 100644 (file)
--- 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 7834803f21cdbecae15c64d28efa3aa1ec907b7b..663c7e2a824017d8be9665d1a2d02021bc50af88 100644 (file)
--- 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 0c007ffd134aa8df4a9ca4228bdaa6b907117ac9..599489448696c0c17cbebe2347579c6b12961527 100644 (file)
--- 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 ae6234f936371244b84baf2f698c343cd3b09fc2..5ef7f69a0aed1bfc901823d80f7d6cc9ee432843 100644 (file)
--- 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 10947b41bc9d6e17855ce7c29d1fe02451e098d3..0bae98fac2e191f03b0869c029f88907d5783255 100644 (file)
--- 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 ddf4d1d8a5d345a78cfe6e3cd582b057c89cf2c3..09818c35050ed289f69655d57e2e5af432671d08 100644 (file)
--- 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 fc2046c595d336c0f5a6729327b565e7ea2194ea..2d86bd50e49aad44d1b21e7795a87d462d785728 100644 (file)
--- 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 f76206e0bec03c537102fc5382191eb2d1e65774..4ba4ae495fe4534b16db73a0d33096c7be6c07f5 100644 (file)
--- 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 7dba533eaadd0899f8b9115ec98e8c7f0a88cc7b..d349010583625f98eb3cfaa8bc1847315b3b3e63 100644 (file)
--- 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 387bc30be7f38e2b407859eceec1cb82d5bc9872..979c42877c627e2a4c3542a7f02122b9830595a3 100644 (file)
--- 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 c4a4e23f7328096eef76818cc9f3fb6d1f7e084a..44912c0e06320da5a4490e5fe372a0e3dcd8c8a1 100644 (file)
--- 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 213836ef617b06c6f262b2d80d8dbd8ac572926e..b8358f5134aaf45b4a9c2d7f29c728c03bbcd7be 100644 (file)
--- 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 8ee688a937fc679e5da92fe5e6eacc4f17f5ff6d..f4552d80a935e7b73e91c1ea9213d1a4364da160 100644 (file)
--- 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,