--- gcin-1.6.8.orig/gen-dist
+++ gcin-1.6.8/gen-dist
@@ -1,5 +1,5 @@
 GCIN_VERSION="gcin-`cat VERSION.gcin`"
-sh gen-gtk3
+#sh gen-gtk3
 sed -i '/^$/d' Changelog.html
 rm -f tags core.*
 cd ..
--- gcin-1.6.8.orig/gtk3-im/gtkimcontextgcin.c
+++ gcin-1.6.8/gtk3-im/gtkimcontextgcin.c
@@ -128,7 +128,7 @@
   GdkWindow *client_window = context_xim->client_window;
   if (!client_window)
     return;
-  GdkScreen *screen = gdk_drawable_get_screen (client_window);
+  GdkScreen *screen = gdk_window_get_screen (client_window);
   if (!screen)
     return;
 
@@ -137,7 +137,7 @@
     return;
 
   if (!context_xim->gcin_ch) {
-    if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY())))
+    if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))
       perror("cannot open gcin_ch");
 #if 1
     context_xim->timeout_handle = 0;