Merge branch 'master' into gdk-pixbuf

diff --combined gdk/gdk.objects.lisp
index 880c2b1,dfd3b30..83da54d
--- 1/gdk/gdk.objects.lisp
--- 2/gdk/gdk.objects.lisp
+++ b/gdk/gdk.objects.lisp
@@@ -435,22 -435,6 +435,22 @@@
    (:bilevel 0)
    (:full 1))
  
 +(define-g-enum "GdkInterpType"
 +    gdk-interp-type
 +    (:export t :type-initializer "gdk_interp_type_get_type")
 +  (:nearest 0)
 +  (:tiles 1)
 +  (:bilinear 2)
 +  (:hyper 3))
 +
 +(define-g-enum "GdkPixbufRotation"
 +    gdk-pixbuf-rotation
 +    (:export t :type-initializer "gdk_pixbuf_rotation_get_type")
 +  (:none 0)
 +  (:counterclockwise 90)
 +  (:upsidedown 180)
 +  (:clockwise 270))
 +
  (define-g-enum "GdkColorspace" colorspace ()
    :rgb)
  
@@@ -943,7 -927,7 +943,7 @@@
    ((:cffi visual colormap-visual (g-object visual)
            "gdk_colormap_get_visual" nil)
     (:cffi screen colormap-screen (g-object screen)
-           "gdk_colormap_get_screeen" nil)))
+           "gdk_colormap_get_screen" nil)))
  
  (define-g-object-class "GdkScreen" screen (:type-initializer "gdk_screen_get_type")
    ((font-options screen-font-options "font-options" "gpointer" t t)