From: Dana Jansens Date: Mon, 30 Dec 2002 06:57:10 +0000 (+0000) Subject: build fixes for member funcs X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=624a06fdffadfadbf6ac14068bbd329cc0a5834f;p=chaz%2Fopenbox build fixes for member funcs --- diff --git a/src/bindings.cc b/src/bindings.cc index 7bf7a5d2..481e75d0 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -149,7 +149,7 @@ static void assimilate(BindingTree *parent, BindingTree *node) int OBBindings::find(BindingTree *search) { BindingTree *a, *b; - a = _tree; + a = _tree.first_child; b = search; while (a && b) { if (a->binding != b->binding) { @@ -206,7 +206,7 @@ bool OBBindings::add(const StringVect &keylist, int id) if (!(tree = buildtree(keylist, id))) return false; // invalid binding requested - if (find_bind(_tree.first_child, tree) < -1) { + if (find(tree) < -1) { // conflicts with another binding destroytree(tree); return false; @@ -226,7 +226,7 @@ int OBBindings::find(const StringVect &keylist) if (!(tree = buildtree(keylist, 0))) return false; // invalid binding requested - ret = find_bind(_tree.first_child, tree) >= 0; + ret = find(tree) >= 0; destroytree(tree);