diff -r 3e55bed345f9 -r a95ee94b9204 dav/config.h --- a/dav/config.h Sat Sep 07 14:08:43 2013 +0200 +++ b/dav/config.h Mon Mar 17 18:42:01 2014 +0100 @@ -31,13 +31,14 @@ #include #include +#include #ifdef __cplusplus extern "C" { #endif typedef struct Repository Repository; -typedef struct Key Key; +typedef struct DavKey Key; typedef struct Proxy Proxy; #define HTTP_PROXY 1 @@ -62,13 +63,6 @@ bool store_key_property; }; -struct Key { - char *name; - KeyType type; - void *data; - size_t length; -}; - struct Proxy { char *url; char *user; @@ -76,7 +70,7 @@ char *no; }; -void load_config(); +void load_config(DavContext *ctx); void load_repository(xmlNode *reponode); void load_key(xmlNode *keynode); void load_proxy(xmlNode *proxynode, int type);