proxy.h in rugged-0.99.0

- old
+ new

@@ -6,12 +6,14 @@
  */
 #ifndef INCLUDE_git_proxy_h__
 #define INCLUDE_git_proxy_h__
 
 #include "common.h"
-#include "transport.h"
 
+#include "cert.h"
+#include "credential.h"
+
 GIT_BEGIN_DECL
 
 /**
  * The type of proxy to use.
  */
@@ -57,19 +59,19 @@
 	 * authentication in order to connect to it.
 	 *
 	 * Returning GIT_PASSTHROUGH will make libgit2 behave as
 	 * though this field isn't set.
 	 */
-	git_cred_acquire_cb credentials;
+	git_credential_acquire_cb credentials;
 
 	/**
 	 * If cert verification fails, this will be called to let the
 	 * user make the final decision of whether to allow the
 	 * connection to proceed. Returns 0 to allow the connection
 	 * or a negative value to indicate an error.
 	 */
-        git_transport_certificate_check_cb certificate_check;
+	git_transport_certificate_check_cb certificate_check;
 
 	/**
 	 * Payload to be provided to the credentials and certificate
 	 * check callbacks.
 	 */
@@ -87,10 +89,10 @@
  *
  * @param opts The `git_proxy_options` struct to initialize.
  * @param version The struct version; pass `GIT_PROXY_OPTIONS_VERSION`.
  * @return Zero on success; -1 on failure.
  */
-GIT_EXTERN(int) git_proxy_init_options(git_proxy_options *opts, unsigned int version);
+GIT_EXTERN(int) git_proxy_options_init(git_proxy_options *opts, unsigned int version);
 
 GIT_END_DECL
 
 #endif