84161997c78fb7f23f9fdb62e8cafd850db6dc88
tdreszer
  Mon Nov 22 14:47:56 2010 -0800
Removed a lot of ifdefs whose time had come.  Renamed one function for clarity.
diff --git src/hg/inc/cart.h src/hg/inc/cart.h
index e26bdb7..b058e97 100644
--- src/hg/inc/cart.h
+++ src/hg/inc/cart.h
@@ -521,25 +521,25 @@
 double cartOrTdbDouble(struct cart *cart, struct trackDb *tdb, char *var, double defaultVal);
 /* Look first in cart, then in trackDb for var.  Return defaultVal if not found. */
 
 boolean cartValueHasChanged(struct cart *newCart,struct hash *oldVars,char *setting,boolean ignoreRemoved,boolean ignoreCreated);
 /* Returns TRUE if new cart setting has changed from old cart setting */
 
 int cartNamesPruneChanged(struct cart *newCart,struct hash *oldVars,
                           struct slPair **cartNames,boolean ignoreRemoved,boolean unChanged);
 /* Prunes a list of cartNames if the settings have changed between new and old cart.
    Returns pruned count */
 
 int cartRemoveFromTdbTree(struct cart *cart,struct trackDb *tdb,char *suffix,boolean skipParent);
 /* Removes a 'trackName.suffix' from all tdb descendents (but not parent).
    If suffix NULL then removes 'trackName' which holds visibility */
 
-boolean cartTdbTreeMatchSubtrackVis(struct cart *cart,struct trackDb *tdbComposite);
+boolean cartTdbTreeReshapeIfNeeded(struct cart *cart,struct trackDb *tdbComposite);
 /* When subtrack vis is set via findTracks, and composite has no cart settings,
    then fashion composite to match found */
 
 boolean cartTdbTreeCleanupOverrides(struct trackDb *tdb,struct cart *newCart,struct hash *oldVars);
 /* When composite/view settings changes, remove subtrack specific settings
    Returns TRUE if any cart vars are removed */
 
 #endif /* CART_H */