File xkeycaps-2.46.patch of Package xkeycaps

--- commands.c
+++ commands.c
@@ -1767,7 +1767,7 @@
 {
   XawListReturnStruct *lr = (XawListReturnStruct *) call_data;
   struct edit_key_box *box = (struct edit_key_box *) client_data;
-  int i = (int) XawToggleGetCurrent (box->keysym_buttons [0]);
+  int i = (long int) XawToggleGetCurrent (box->keysym_buttons [0]);
   if (i > 0)
     {
       Widget button = box->keysym_buttons [i-1];
@@ -1779,7 +1779,7 @@
 		      XtParent (button)->core.width,
 		      button->core.height,
 		      button->core.border_width);
-      XtVaSetValues (button, XtNlabel, lr->string, 0);
+      XtVaSetValues (button, XtNlabel, lr->string, NULL);
     }
 }
 
@@ -2199,7 +2199,7 @@
   XtAddCallback (set_list, XtNcallback, keyset_list_cb, (XtPointer) box);
 
   /* Gag!  These lists won't size themselves correctly. */
-  XtVaSetValues (set_list, XtNwidth, set_list->core.width + 20, 0);
+  XtVaSetValues (set_list, XtNwidth, set_list->core.width + 20, NULL);
 
   ac = 0;
   keyset_syms_box = XtCreateManagedWidget ("keysetSymsBox", formWidgetClass,
@@ -2228,7 +2228,7 @@
   XtAddCallback (sym_list, XtNcallback, keysym_list_cb, (XtPointer) box);
 
   /* Gag!  These lists won't size themselves correctly. */
-  XtVaSetValues (sym_list, XtNwidth, sym_list->core.width + 20, 0);
+  XtVaSetValues (sym_list, XtNwidth, sym_list->core.width + 20, NULL);
 
   ac = 0;
   XtSetArg (av[ac], XtNskipAdjust, True); ac++;
@@ -2548,7 +2548,7 @@
     int w, h;
     Pixmap p = get_keyboard_icon (XtDisplay (widget),
 				  &all_kbds [box->set->kbd_index], &w, &h);
-    XtVaSetValues (box->icon, XtNbitmap, p, XtNheight, h, 0);
+    XtVaSetValues (box->icon, XtNbitmap, p, XtNheight, h, NULL);
   }
 }
 
@@ -2653,7 +2653,7 @@
   XtAddCallback (vendor_list, XtNcallback, vendor_list_cb, (XtPointer) box);
 
   /* Gag!  These lists won't size themselves correctly. */
-  XtVaSetValues (vendor_list, XtNwidth, vendor_list->core.width + 20, 0);
+  XtVaSetValues (vendor_list, XtNwidth, vendor_list->core.width + 20, NULL);
 
   ac = 0;
   keyboard_box = XtCreateManagedWidget ("keyboardBox", formWidgetClass,
@@ -2681,7 +2681,7 @@
     XtAddCallback (kbd_list, XtNcallback, keyboard_list_cb, (XtPointer) box);
 
     /* Gag!  These lists won't size themselves correctly. */
-    XtVaSetValues (kbd_list, XtNwidth, kbd_list->core.width + 20, 0);
+    XtVaSetValues (kbd_list, XtNwidth, kbd_list->core.width + 20, NULL);
   }
 
   ac = 0;
@@ -2707,7 +2707,7 @@
     XtAddCallback (map_list, XtNcallback, keymap_list_cb, (XtPointer) box);
 
     /* Gag!  These lists won't size themselves correctly. */
-    XtVaSetValues (map_list, XtNwidth, map_list->core.width + 20, 0);
+    XtVaSetValues (map_list, XtNwidth, map_list->core.width + 20, NULL);
   }
   ac = 0;
   XtSetArg (av[ac], XtNskipAdjust, True); ac++;
@@ -2744,7 +2744,7 @@
     widget->keyboard.key_menus->select_kbd_box;
 
   select_kbd_box->keyboard = widget;
-  XtVaSetValues (select_kbd_box->label2, XtNlabel, choose_kbd_message, 0);
+  XtVaSetValues (select_kbd_box->label2, XtNlabel, choose_kbd_message, NULL);
   choose_kbd_dubious_p = 0;
   choose_kbd_message [0] = 0;