diff -u -p -r1.20 gdkscreen.c
--- gtk+-2.8.2.orig/gdk/gdkscreen.c	24 Aug 2005 03:29:05 -0000	1.20
+++ gdk+-2.8.2/gdk/gdkscreen.c	25 Aug 2005 15:55:20 -0000
@@ -29,7 +29,7 @@
 #include "gdkalias.h"
 
 static void gdk_screen_class_init  (GdkScreenClass *klass);
-static void gdk_screen_init        (GdkScreen      *screen);
+static void gdk_screen_init_instance (GTypeInstance *instance, gpointer g_class);
 static void gdk_screen_dispose     (GObject        *object);
 static void gdk_screen_finalize    (GObject        *object);
 
@@ -53,14 +53,14 @@ gdk_screen_get_type (void)
       static const GTypeInfo object_info =
 	{
 	  sizeof (GdkScreenClass),
-	  (GBaseInitFunc) gdk_screen_init,
+	  (GBaseInitFunc) NULL,
 	  (GBaseFinalizeFunc) NULL,
 	  (GClassInitFunc) gdk_screen_class_init,
 	  NULL,			/* class_finalize */
 	  NULL,			/* class_data */
 	  sizeof (GdkScreen),
 	  0,			/* n_preallocs */
-	  (GInstanceInitFunc) NULL,
+	  (GInstanceInitFunc) gdk_screen_init_instance,
 	};
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
@@ -101,9 +101,10 @@ gdk_screen_class_init (GdkScreenClass *k
 }
 
 static void
-gdk_screen_init (GdkScreen *screen)
+gdk_screen_init_instance (GTypeInstance *instance,
+                          gpointer g_class)
 {
-    screen->resolution = -1;
+    GDK_SCREEN (instance)->resolution = -1.;
 }
 
 static void
@@ -407,7 +408,7 @@ gdk_screen_set_resolution_libgtk_only (G
     if (dpi >= 0)
 	screen->resolution = dpi;
     else
-	screen->resolution = -1;
+	screen->resolution = -1.;
 }
 
 /**