Merges from gtk-1-2

2000-03-14 19:57:25 +00:00
parent 3f98a849c7
commit 10ba4fd066
98 changed files with 3772 additions and 1749 deletions
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@ -445,7 +445,7 @@ gdk_im_close (void)
    }
 }

-gint 
+gboolean
 gdk_im_ready (void)
 {
  return (xim_im != NULL);