diff -r cc2170ea05ad -r 46448d38885c ui/gtk/toolbar.c
--- a/ui/gtk/toolbar.c	Fri Nov 10 18:04:40 2017 +0100
+++ b/ui/gtk/toolbar.c	Sat Nov 11 08:34:06 2017 +0100
@@ -159,7 +159,7 @@
 void ui_toolbar_combobox(
         char *name,
         UiList *list,
-        ui_model_getvalue_f getvalue,
+        ui_getvaluefunc getvalue,
         ui_callback f,
         void *udata)
 {
@@ -188,7 +188,7 @@
 void ui_toolbar_combobox_nv(
         char *name,
         char *listname,
-        ui_model_getvalue_f getvalue,
+        ui_getvaluefunc getvalue,
         ui_callback f,
         void *udata)
 {
@@ -358,7 +358,7 @@
 }
 
 void add_toolbar_combobox(GtkToolbar *tb, UiToolbarComboBox *cb, UiObject *obj) {
-    UiModelInfo *modelinfo = ui_model_info(obj->ctx, UI_STRING, "", -1);
+    UiModel *modelinfo = ui_model_info(obj->ctx, UI_STRING, "", -1);
     modelinfo->getvalue = cb->getvalue;
     UiListModel *model = ui_list_model_new(cb->var, modelinfo);
     
@@ -371,7 +371,7 @@
 void add_toolbar_combobox_nv(GtkToolbar *tb, UiToolbarComboBoxNV *cb, UiObject *obj) {
     UiVar *var = uic_create_var(obj->ctx, cb->listname, UI_VAR_LIST);
     if(var) {
-        UiModelInfo *modelinfo = ui_model_info(obj->ctx, UI_STRING, "", -1);
+        UiModel *modelinfo = ui_model_info(obj->ctx, UI_STRING, "", -1);
         modelinfo->getvalue = cb->getvalue;
         UiListModel *model = ui_list_model_new(var, modelinfo);