Index: gdk/gdkwindow.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.c,v
retrieving revision 1.187
diff -u -p -d -r1.187 gdkwindow.c
--- gdk/gdkwindow.c	17 Jul 2006 04:19:59 -0000	1.187
+++ gdk/gdkwindow.c	2 Oct 2006 17:35:34 -0000
@@ -218,7 +218,7 @@ _gdk_paintable_get_type (void)
 
   if (!paintable_type)
     {
-      static const GTypeInfo paintable_info =
+      const GTypeInfo paintable_info =
       {
 	sizeof (GdkPaintableIface),  /* class_size */
 	NULL,                        /* base_init */
Index: gtk/gtkactiongroup.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkactiongroup.c,v
retrieving revision 1.59
diff -u -p -d -r1.59 gtkactiongroup.c
--- gtk/gtkactiongroup.c	22 Jun 2006 15:56:55 -0000	1.59
+++ gtk/gtkactiongroup.c	2 Oct 2006 17:35:34 -0000
@@ -95,7 +95,7 @@ gtk_action_group_get_type (void)
 
   if (!type)
     {
-      static const GTypeInfo type_info =
+      const GTypeInfo type_info =
       {
         sizeof (GtkActionGroupClass),
 	NULL,           /* base_init */
Index: gtk/gtkcelleditable.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcelleditable.c,v
retrieving revision 1.12
diff -u -p -d -r1.12 gtkcelleditable.c
--- gtk/gtkcelleditable.c	1 Sep 2005 05:11:39 -0000	1.12
+++ gtk/gtkcelleditable.c	2 Oct 2006 17:35:34 -0000
@@ -33,7 +33,7 @@ gtk_cell_editable_get_type (void)
 
   if (! cell_editable_type)
     {
-      static const GTypeInfo cell_editable_info =
+      const GTypeInfo cell_editable_info =
       {
 	sizeof (GtkCellEditableIface), /* class_size */
 	gtk_cell_editable_base_init,   /* base_init */
Index: gtk/gtkcelllayout.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcelllayout.c,v
retrieving revision 1.11
diff -u -p -d -r1.11 gtkcelllayout.c
--- gtk/gtkcelllayout.c	1 Sep 2005 05:11:39 -0000	1.11
+++ gtk/gtkcelllayout.c	2 Oct 2006 17:35:34 -0000
@@ -29,7 +29,7 @@ gtk_cell_layout_get_type (void)
 
   if (! cell_layout_type)
     {
-      static const GTypeInfo cell_layout_info =
+      const GTypeInfo cell_layout_info =
       {
         sizeof (GtkCellLayoutIface),
         NULL,
Index: gtk/gtkclipboard-quartz.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkclipboard-quartz.c,v
retrieving revision 1.5
diff -u -p -d -r1.5 gtkclipboard-quartz.c
--- gtk/gtkclipboard-quartz.c	10 Sep 2006 06:39:16 -0000	1.5
+++ gtk/gtkclipboard-quartz.c	2 Oct 2006 17:35:34 -0000
@@ -152,7 +152,7 @@ gtk_clipboard_get_type (void)
   
   if (!clipboard_type)
     {
-      static const GTypeInfo clipboard_info =
+      const GTypeInfo clipboard_info =
       {
 	sizeof (GtkClipboardClass),
 	NULL,           /* base_init */
Index: gtk/gtkcontainer.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcontainer.c,v
retrieving revision 1.141
diff -u -p -d -r1.141 gtkcontainer.c
--- gtk/gtkcontainer.c	14 Dec 2005 19:39:44 -0000	1.141
+++ gtk/gtkcontainer.c	2 Oct 2006 17:35:34 -0000
@@ -120,7 +120,7 @@ gtk_container_get_type (void)
 
   if (!container_type)
     {
-      static const GTypeInfo container_info =
+      const GTypeInfo container_info =
       {
 	sizeof (GtkContainerClass),
 	(GBaseInitFunc) gtk_container_base_class_init,
Index: gtk/gtkcurve.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcurve.c,v
retrieving revision 1.46
diff -u -p -d -r1.46 gtkcurve.c
--- gtk/gtkcurve.c	6 Jul 2006 05:14:01 -0000	1.46
+++ gtk/gtkcurve.c	2 Oct 2006 17:35:34 -0000
@@ -87,7 +87,7 @@ gtk_curve_get_type (void)
 
   if (!curve_type)
     {
-      static const GTypeInfo curve_info =
+      const GTypeInfo curve_info =
       {
 	sizeof (GtkCurveClass),
 	NULL,		/* base_init */
Index: gtk/gtkeditable.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkeditable.c,v
retrieving revision 1.51
diff -u -p -d -r1.51 gtkeditable.c
--- gtk/gtkeditable.c	2 May 2006 23:56:40 -0000	1.51
+++ gtk/gtkeditable.c	2 Oct 2006 17:35:34 -0000
@@ -43,7 +43,7 @@ gtk_editable_get_type (void)
 
   if (!editable_type)
     {
-      static const GTypeInfo editable_info =
+      const GTypeInfo editable_info =
       {
 	sizeof (GtkEditableClass),  /* class_size */
 	gtk_editable_base_init,	    /* base_init */
Index: gtk/gtkfilechooserembed.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserembed.c,v
retrieving revision 1.17
diff -u -p -d -r1.17 gtkfilechooserembed.c
--- gtk/gtkfilechooserembed.c	10 Sep 2006 06:39:16 -0000	1.17
+++ gtk/gtkfilechooserembed.c	2 Oct 2006 17:35:34 -0000
@@ -141,7 +141,7 @@ _gtk_file_chooser_embed_get_type (void)
 
   if (!file_chooser_embed_type)
     {
-      static const GTypeInfo file_chooser_embed_info =
+      const GTypeInfo file_chooser_embed_info =
       {
 	sizeof (GtkFileChooserEmbedIface),  /* class_size */
 	NULL,                          /* base_init */
Index: gtk/gtkfilesystem.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilesystem.c,v
retrieving revision 1.61
diff -u -p -d -r1.61 gtkfilesystem.c
--- gtk/gtkfilesystem.c	10 Sep 2006 06:39:16 -0000	1.61
+++ gtk/gtkfilesystem.c	2 Oct 2006 17:35:34 -0000
@@ -402,7 +402,7 @@ gtk_file_system_get_type (void)
 
   if (!file_system_type)
     {
-      static const GTypeInfo file_system_info =
+      const GTypeInfo file_system_info =
       {
 	sizeof (GtkFileSystemIface),  /* class_size */
 	gtk_file_system_base_init,    /* base_init */
@@ -1031,7 +1031,7 @@ gtk_file_folder_get_type (void)
 
   if (!file_folder_type)
     {
-      static const GTypeInfo file_folder_info =
+      const GTypeInfo file_folder_info =
       {
 	sizeof (GtkFileFolderIface),  /* class_size */
 	gtk_file_folder_base_init,    /* base_init */
Index: gtk/gtkiconview.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkiconview.c,v
retrieving revision 1.103
diff -u -p -d -r1.103 gtkiconview.c
--- gtk/gtkiconview.c	16 Aug 2006 20:42:15 -0000	1.103
+++ gtk/gtkiconview.c	2 Oct 2006 17:35:34 -0000
@@ -8092,7 +8092,7 @@ gtk_icon_view_item_accessible_get_type (
 
   if (!type)
     {
-      static const GTypeInfo tinfo =
+      const GTypeInfo tinfo =
       {
         sizeof (GtkIconViewItemAccessibleClass),
         (GBaseInitFunc) NULL, /* base init */
@@ -9100,7 +9100,7 @@ gtk_icon_view_accessible_factory_get_typ
 
   if (!type)
     {
-      static const GTypeInfo tinfo =
+      const GTypeInfo tinfo =
       {
         sizeof (AtkObjectFactoryClass),
         NULL,           /* base_init */
Index: gtk/gtkobject.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkobject.c,v
retrieving revision 1.119
diff -u -p -d -r1.119 gtkobject.c
--- gtk/gtkobject.c	9 Mar 2006 13:33:46 -0000	1.119
+++ gtk/gtkobject.c	2 Oct 2006 17:35:34 -0000
@@ -82,7 +82,7 @@ gtk_object_get_type (void)
 
   if (!object_type)
     {
-      static const GTypeInfo object_info =
+      const GTypeInfo object_info =
       {
 	sizeof (GtkObjectClass),
 	(GBaseInitFunc) gtk_object_base_class_init,
Index: gtk/gtkpagesetupunixdialog.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkpagesetupunixdialog.c,v
retrieving revision 1.16
diff -u -p -d -r1.16 gtkpagesetupunixdialog.c
--- gtk/gtkpagesetupunixdialog.c	14 Jun 2006 16:48:07 -0000	1.16
+++ gtk/gtkpagesetupunixdialog.c	2 Oct 2006 17:35:34 -0000
@@ -126,7 +126,7 @@ static void printer_status_cb           
 
 
 
-static const gchar * const common_paper_sizes[] = {
+static const gchar const common_paper_sizes[][16] = {
   "na_letter",
   "na_legal",
   "iso_a4",
Index: gtk/gtkprintoperationpreview.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkprintoperationpreview.c,v
retrieving revision 1.5
diff -u -p -d -r1.5 gtkprintoperationpreview.c
--- gtk/gtkprintoperationpreview.c	15 Aug 2006 19:49:23 -0000	1.5
+++ gtk/gtkprintoperationpreview.c	2 Oct 2006 17:35:34 -0000
@@ -35,7 +35,7 @@ gtk_print_operation_preview_get_type (vo
 
   if (!print_operation_preview_type)
     {
-      static const GTypeInfo print_operation_preview_info =
+      const GTypeInfo print_operation_preview_info =
       {
         sizeof (GtkPrintOperationPreviewIface), /* class_size */
 	gtk_print_operation_preview_base_init,   /* base_init */
Index: gtk/gtkrecentchooserdefault.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkrecentchooserdefault.c,v
retrieving revision 1.9
diff -u -p -d -r1.9 gtkrecentchooserdefault.c
--- gtk/gtkrecentchooserdefault.c	10 Sep 2006 06:39:16 -0000	1.9
+++ gtk/gtkrecentchooserdefault.c	2 Oct 2006 17:35:34 -0000
@@ -163,9 +163,6 @@ static const GtkTargetEntry recent_list_
   { "text/uri-list", 0, TEXT_URI_LIST }
 };
 
-static const int num_recent_list_source_targets = (sizeof (recent_list_source_targets)
-                                                   / sizeof (recent_list_source_targets[0]));
-
 /* Icon size for if we can't get it from the theme */
 #define FALLBACK_ICON_SIZE  48
 #define FALLBACK_ITEM_LIMIT 20
@@ -445,7 +442,7 @@ gtk_recent_chooser_default_constructor (
   gtk_drag_source_set (impl->recent_view,
 		       GDK_BUTTON1_MASK,
 		       recent_list_source_targets,
-		       num_recent_list_source_targets,
+		       G_N_ELEMENTS (recent_list_source_targets),
 		       GDK_ACTION_COPY);
 
   impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12);
Index: gtk/gtkthemes.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkthemes.c,v
retrieving revision 1.29
diff -u -p -d -r1.29 gtkthemes.c
--- gtk/gtkthemes.c	16 Dec 2005 19:06:08 -0000	1.29
+++ gtk/gtkthemes.c	2 Oct 2006 17:35:34 -0000
@@ -137,7 +137,7 @@ gtk_theme_engine_get_type (void)
 
   if (!theme_engine_type)
     {
-      static const GTypeInfo theme_engine_info = {
+      const GTypeInfo theme_engine_info = {
         sizeof (GtkThemeEngineClass),
         NULL,           /* base_init */
         NULL,           /* base_finalize */
Index: gtk/gtktreednd.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktreednd.c,v
retrieving revision 1.16
diff -u -p -d -r1.16 gtktreednd.c
--- gtk/gtktreednd.c	2 May 2006 23:56:42 -0000	1.16
+++ gtk/gtktreednd.c	2 Oct 2006 17:35:34 -0000
@@ -30,7 +30,7 @@ gtk_tree_drag_source_get_type (void)
 
   if (!our_type)
     {
-      static const GTypeInfo our_info =
+      const GTypeInfo our_info =
       {
         sizeof (GtkTreeDragSourceIface), /* class_size */
 	NULL,		/* base_init */
@@ -59,7 +59,7 @@ gtk_tree_drag_dest_get_type (void)
 
   if (!our_type)
     {
-      static const GTypeInfo our_info =
+      const GTypeInfo our_info =
       {
         sizeof (GtkTreeDragDestIface), /* class_size */
 	NULL,		/* base_init */
Index: gtk/gtktreemodel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktreemodel.c,v
retrieving revision 1.129
diff -u -p -d -r1.129 gtktreemodel.c
--- gtk/gtktreemodel.c	16 Aug 2006 20:52:23 -0000	1.129
+++ gtk/gtktreemodel.c	2 Oct 2006 17:35:35 -0000
@@ -102,7 +102,7 @@ gtk_tree_model_get_type (void)
 
   if (! tree_model_type)
     {
-      static const GTypeInfo tree_model_info =
+      const GTypeInfo tree_model_info =
       {
         sizeof (GtkTreeModelIface), /* class_size */
 	gtk_tree_model_base_init,   /* base_init */
Index: gtk/gtktreesortable.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktreesortable.c,v
retrieving revision 1.23
diff -u -p -d -r1.23 gtktreesortable.c
--- gtk/gtktreesortable.c	4 Jan 2006 07:06:12 -0000	1.23
+++ gtk/gtktreesortable.c	2 Oct 2006 17:35:35 -0000
@@ -33,7 +33,7 @@ gtk_tree_sortable_get_type (void)
 
   if (! tree_sortable_type)
     {
-      static const GTypeInfo tree_sortable_info =
+      const GTypeInfo tree_sortable_info =
       {
 	sizeof (GtkTreeSortableIface), /* class_size */
 	gtk_tree_sortable_base_init,   /* base_init */
Index: gtk/gtkwindow.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwindow.c,v
retrieving revision 1.325
diff -u -p -d -r1.325 gtkwindow.c
--- gtk/gtkwindow.c	5 Jul 2006 16:22:50 -0000	1.325
+++ gtk/gtkwindow.c	2 Oct 2006 17:35:35 -0000
@@ -7022,7 +7022,7 @@ gtk_window_group_get_type (void)
 
   if (!window_group_type)
     {
-      static const GTypeInfo window_group_info =
+      const GTypeInfo window_group_info =
       {
 	sizeof (GtkWindowGroupClass),
 	NULL,		/* base_init */