Index: doc-rnd/TODO =================================================================== --- doc-rnd/TODO (revision 1471) +++ doc-rnd/TODO (revision 1472) @@ -4,7 +4,6 @@ - lesstif conversion: - check if ctrl+1..ctrl+4 works - - check if multikey works in lesstif - resource conv cleanup: - rewrite hid_gtk to use the keyboard input layer from hid_cfg @@ -14,9 +13,6 @@ - enable gpmi and test dynamic menu insertion - search for "resource" in src/ and in src_plugin/, rename -- lihata: - - const correctness in path_ - Cleanup #4: - reduce - replace hid_load_settings() with lihata Index: src/hid_cfg.c =================================================================== --- src/hid_cfg.c (revision 1471) +++ src/hid_cfg.c (revision 1472) @@ -162,7 +162,7 @@ if (fieldstr == NULL) return NULL; - return lht_tree_path_(submenu->doc, (lht_node_t *)submenu, fieldstr, 1, 0, &err); + return lht_tree_path_(submenu->doc, submenu, fieldstr, 1, 0, &err); } const char *hid_cfg_menu_field_str(const lht_node_t *submenu, hid_cfg_menufield_t field) @@ -226,5 +226,5 @@ lht_node_t *hid_cfg_get_submenu(lht_node_t *parent, const char *path) { - return lht_tree_path_(parent->doc, (lht_node_t *)parent, path, 1, 0, NULL); + return lht_tree_path_(parent->doc, parent, path, 1, 0, NULL); } Index: src_plugins/hid_gtk/ghid-main-menu.c =================================================================== --- src_plugins/hid_gtk/ghid-main-menu.c (revision 1471) +++ src_plugins/hid_gtk/ghid-main-menu.c (revision 1472) @@ -403,7 +403,7 @@ lht_node_t *submenu, *i; GtkWidget *new_menu; - submenu = lht_tree_path_(res->doc, (lht_node_t *)res, "submenu", 1, 0, NULL); + submenu = lht_tree_path_(res->doc, res, "submenu", 1, 0, NULL); if (submenu == NULL) { hid_cfg_error(res, "can not create popup without submenu list"); return;