diff -r 1a786201465f -r efaae97bd95b ui/motif/toolbar.c
--- a/ui/motif/toolbar.c	Sun Nov 29 21:43:03 2015 +0100
+++ b/ui/motif/toolbar.c	Mon Nov 30 14:09:55 2015 +0100
@@ -246,7 +246,7 @@
                 obj->ctx->mempool,
                 sizeof(UiEventData));
         event->obj = obj;
-        event->user_data = item->userdata;
+        event->userdata = item->userdata;
         event->callback = item->callback;
         XtAddCallback(
                 button,
@@ -280,7 +280,7 @@
                 obj->ctx->mempool,
                 sizeof(UiEventData));
         event->obj = obj;
-        event->user_data = item->userdata;
+        event->userdata = item->userdata;
         event->callback = item->callback;
         XtAddCallback(
                 button,
@@ -313,7 +313,7 @@
                 obj->ctx->mempool,
                 sizeof(UiEventData));
         event->obj = obj;
-        event->user_data = item->userdata;
+        event->userdata = item->userdata;
         event->callback = item->callback;
         XtAddCallback(
                 button,