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

24 files changed, 24 insertions, 24 deletions

diff --git a/modules/engines/ms-windows/msw_rc_style.c b/modules/engines/ms-windows/msw_rc_style.c
index b80f71332a..62c29adca1 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 a21494b298..27f85947fc 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 dec14e5be1..38f2761232 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 af6490aac0..a3367c4a0e 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 5322b342e0..84fd1e0c83 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 947209810d..7c2a2282e7 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 640c013c5f..5592a1ebf0 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 a9e584c5ca..cefbf609b4 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 6e910a9972..f989ca4c46 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 98db8e8f3f..59c4498d57 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 aac8d40396..ef4c7decbe 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 38a03988a0..d727da743e 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 900dc0b81f..b526d8f402 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 ea1da49475..ad623448c7 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 7834803f21..663c7e2a82 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 0c007ffd13..5994894486 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 ae6234f936..5ef7f69a0a 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 10947b41bc..0bae98fac2 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 ddf4d1d8a5..09818c3505 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 fc2046c595..2d86bd50e4 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 f76206e0be..4ba4ae495f 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 7dba533eaa..d349010583 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 387bc30be7..979c42877c 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 c4a4e23f73..44912c0e06 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 */