From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 20 Apr 2008 19:17:45 +0000 (+0100)
Subject: Merge from 3.0 fixes branch
X-Git-Tag: 5.0.3~122
X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/commitdiff_plain/7378b5081fde6f48140327d5c072a8231934f027

Merge from 3.0 fixes branch
---

7378b5081fde6f48140327d5c072a8231934f027
diff --cc lib/trackdb.h
index e39de6e,e100f25..f372f4c
--- a/lib/trackdb.h
+++ b/lib/trackdb.h
@@@ -171,12 -171,8 +171,13 @@@ int trackdb_edituserinfo(const char *us
  char **trackdb_listusers(void);
  int trackdb_confirm(const char *user, const char *confirmation,
                      rights_type *rightsp);
+ int trackdb_readable(void);
  
 +typedef void random_callback(struct ev_source *ev,
 +                             const char *track);
 +int trackdb_request_random(struct ev_source *ev,
 +                           random_callback *callback);
 +
  #endif /* TRACKDB_H */
  
  /*