diff --git a/glib/testglib.c b/glib/testglib.c
index 4dc782b07..2763e85ce 100644
--- a/glib/testglib.c
+++ b/glib/testglib.c
@@ -15,6 +15,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <stdio.h>
 #include <string.h>
 #include "glib.h"
@@ -49,7 +50,7 @@ my_list_compare_one (gpointer a, gpointer b)
   gint one = *((gint*)a);
   gint two = *((gint*)b);
   return one-two;
-};
+}
 
 gint 
 my_list_compare_two (gpointer a, gpointer b)
@@ -57,7 +58,7 @@ my_list_compare_two (gpointer a, gpointer b)
   gint one = *((gint*)a);
   gint two = *((gint*)b);
   return two-one;
-};
+}
 
 /* void
 my_list_print (gpointer a, gpointer b)
@@ -86,6 +87,14 @@ my_traverse (gpointer key,
   return FALSE;
 }
 
+void
+print_compare (gchar *a, 
+	       gchar *b)
+{
+  g_print ("%s <=> %s : %d\n", a, b, g_strcasecmp(a,b));
+  g_print ("%s <=> %s : %d\n", b, a, g_strcasecmp(b,a));
+}
+
 int
 main (int   argc,
       char *argv[])
@@ -386,6 +395,10 @@ main (int   argc,
 
   g_print ("ok\n");
 
+  g_print ("checking g_strcasecmp...\n");
+  print_compare ("Schlo��", "Schlo");
+  print_compare ("��ffchen", "��fchen");
+
   /* g_debug (argv[0]); */
 
 
diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h
index 69146836f..ab082b582 100644
--- a/gtk/gtkinputdialog.h
+++ b/gtk/gtkinputdialog.h
@@ -59,11 +59,9 @@ struct _GtkInputDialogClass
   GtkWindowClass parent_class;
 
   void (* enable_device)               (GtkInputDialog    *inputd,
-					guint32            devid,
-					gpointer          *data);
+					guint32            devid);
   void (* disable_device)              (GtkInputDialog    *inputd,
-					guint32            devid,
-					gpointer          *data);
+					guint32            devid);
 };
 
 
diff --git a/gtk/gtktreeitem.h b/gtk/gtktreeitem.h
index 035e01633..8093620f9 100644
--- a/gtk/gtktreeitem.h
+++ b/gtk/gtktreeitem.h
@@ -45,6 +45,8 @@ struct _GtkTreeItem
   GtkWidget *pixmaps_box;
   GtkWidget *plus_pix_widget, *minus_pix_widget;
 
+  GList *pixmaps;		/* pixmap node for this items color depth */
+
   guint expanded : 1;
 };