--- bdf.c.orig	2007-07-05 16:01:49.000000000 -0600
+++ bdf.c	2007-07-05 16:17:18.000000000 -0600
@@ -1092,7 +1092,7 @@
 static void
 _bdf_add_property(bdf_font_t *font, char *name, char *value)
 {
-    unsigned int propid;
+    unsigned long propid;
     hashnode hn;
     int len;
     bdf_property_t *prop, *fp;
@@ -1105,7 +1105,7 @@
          * The property already exists in the font, so simply replace
          * the value of the property with the current value.
          */
-        fp = font->props + (unsigned int) hn->data;
+        fp = font->props + (unsigned long) hn->data;
 
         switch (fp->format) {
           case BDF_ATOM:
@@ -1159,7 +1159,7 @@
         font->props_size++;
     }
 
-    propid = (unsigned int) hn->data;
+    propid = (unsigned long) hn->data;
     if (propid >= _num_bdf_properties)
       prop = user_props + (propid - _num_bdf_properties);
     else
@@ -1199,7 +1199,7 @@
       /*
        * Add the property to the font property table.
        */
-      hash_insert(fp->name, (void *) font->props_used,
+      hash_insert(fp->name, (void *) ((unsigned long) font->props_used),
                   (hashtable *) font->internal);
 
     font->props_used++;
@@ -1883,7 +1883,7 @@
 void
 bdf_setup(void)
 {
-    unsigned int i;
+    unsigned long i;
     bdf_property_t *prop;
 
     hash_init(&proptbl);
@@ -3206,7 +3206,7 @@
 void
 bdf_create_property(char *name, int format)
 {
-    unsigned int n;
+    unsigned long n;
     bdf_property_t *p;
 
     /*
@@ -3243,7 +3243,7 @@
 bdf_get_property(char *name)
 {
     hashnode hn;
-    unsigned int propid;
+    unsigned long propid;
 
     if (name == 0 || *name == 0)
       return 0;
@@ -3251,7 +3251,7 @@
     if ((hn = hash_lookup(name, &proptbl)) == 0)
       return 0;
 
-    propid = (unsigned int) hn->data;
+    propid = (unsigned long) hn->data;
     if (propid >= _num_bdf_properties)
       return user_props + (propid - _num_bdf_properties);
     return _bdf_properties + propid;
@@ -3333,7 +3333,7 @@
 bdf_add_font_property(bdf_font_t *font, bdf_property_t *property)
 {
     int len;
-    unsigned int propid;
+    unsigned long propid;
     hashnode hn;
     bdf_property_t *p, *ip;
 
@@ -3360,7 +3360,7 @@
          * If the property exists and is a user defined property, make sure
          * its format is updated to match the property being added.
          */
-        propid = (unsigned int) hn->data;
+        propid = (unsigned long) hn->data;
         if (propid >= _num_bdf_properties) {
             p = user_props + (propid - _num_bdf_properties);
             if (p->format != property->format)
@@ -3376,7 +3376,7 @@
         /*
          * Changing an existing property value.
          */
-        p = font->props + ((unsigned int) hn->data);
+        p = font->props + ((unsigned long) hn->data);
 
         /*
          * If the format changed, then free the atom value if the original
@@ -3433,7 +3433,7 @@
          * name of the property.
          */
         hn = hash_lookup(property->name, &proptbl);
-        propid = (unsigned int) hn->data;
+        propid = (unsigned long) hn->data;
         if (propid >= _num_bdf_properties)
           ip = user_props + (propid - _num_bdf_properties);
         else
@@ -3480,7 +3480,7 @@
         /*
          * Now insert it into the internal hash table.
          */
-        hash_insert(p->name, (void *) font->props_used,
+        hash_insert(p->name, (void *) ((unsigned long) font->props_used),
                     (hashtable *) font->internal);
         font->props_used++;
     }
@@ -3552,7 +3552,7 @@
 bdf_delete_font_property(bdf_font_t *font, char *name)
 {
     hashnode hn;
-    unsigned int off;
+    unsigned long off;
     bdf_property_t *p;
 
     if (font == 0 || name == 0 || *name == 0 || font->props_used == 0)
@@ -3561,7 +3561,7 @@
     if ((hn = hash_lookup(name, (hashtable *) font->internal)) == 0)
       return;
 
-    off = (unsigned int) hn->data;
+    off = (unsigned long) hn->data;
     p = font->props + off;
 
     /*
@@ -3616,7 +3616,7 @@
       return 0;
 
     hn = hash_lookup(name, (hashtable *) font->internal);
-    return (hn) ? (font->props + ((unsigned int) hn->data)) : 0;
+    return (hn) ? (font->props + ((unsigned long) hn->data)) : 0;
 }
 
 typedef struct {
--- bdfpsf.c.orig	2007-07-05 16:33:12.000000000 -0600
+++ bdfpsf.c	2007-07-05 16:33:15.000000000 -0600
@@ -105,7 +105,7 @@
 {
     int i, more, c0, c1, cnt;
     unsigned int code;
-    unsigned char buf[4];
+    unsigned char buf[6];
     bdf_glyph_t *gp;
 
     gp = font->glyphs;
--- guifile.c.orig	2007-07-05 16:18:00.000000000 -0600
+++ guifile.c	2007-07-05 16:22:07.000000000 -0600
@@ -1858,7 +1858,7 @@
     /*
      * Now set up a file name.
      */
-    sprintf(buffer1, "%.*s.bdf", dot - file, file);
+    sprintf(buffer1, "%.*s.bdf", (int) (dot - file), file);
 
     /*
      * Delete the file and path names so they can be updated.
Index: guigedit.c
===================================================================
--- guigedit.c	(revision 49)
+++ guigedit.c	(working copy)
@@ -1293,7 +1293,6 @@
      * until we explicitly get rid of it later.
      */
     g_object_ref(G_OBJECT(ge->ops.rotate_adj));
-    gtk_object_sink(GTK_OBJECT(ge->ops.rotate_adj));
 
     ge->ops.shear_adj =
         (GtkAdjustment *) gtk_adjustment_new(0.0, -20.0, 20.0, 1.0,
@@ -1303,7 +1302,6 @@
      * until we explicitly get rid of it later.
      */
     g_object_ref(G_OBJECT(ge->ops.shear_adj));
-    gtk_object_sink(GTK_OBJECT(ge->ops.shear_adj));
 
     hbox = gtk_hbox_new(FALSE, 0);
     label = gtk_label_new("Degrees:");