Update for current soup-ssl.h prototypes

	* libsoup/soup-nossl.c: Update for current soup-ssl.h prototypes

	* tests/proxy-test.c (run_test): wrap https tests in #if HAVE_SSL

svn path=/trunk/; revision=940

diff --git a/ChangeLog b/ChangeLog
index 0e0cb86..458094a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-08  Dan Winship  <danw@gnome.org>
+
+       * libsoup/soup-nossl.c: Update for current soup-ssl.h prototypes
+
+       * tests/proxy-test.c (run_test): wrap https tests in #if HAVE_SSL
+
 2007-10-05  Dan Winship  <danw@gnome.org>
 
        * configure.in: 2.2.101

diff --git a/libsoup/soup-nossl.c b/libsoup/soup-nossl.c
index 50bc1a5..b7ca76c 100644 (file)
--- a/libsoup/soup-nossl.c
+++ b/libsoup/soup-nossl.c
@@ -18,31 +18,31 @@ gboolean soup_ssl_supported = FALSE;
 
 GIOChannel *
 soup_ssl_wrap_iochannel (GIOChannel *sock, SoupSSLType type,
-                        const char *hostname, gpointer cred_pointer)
+                        const char *hostname, SoupSSLCredentials *creds)
 {
        return NULL;
 }
 
-gpointer
+SoupSSLCredentials *
 soup_ssl_get_client_credentials (const char *ca_file)
 {
        return NULL;
 }
 
 void
-soup_ssl_free_client_credentials (gpointer client_creds)
+soup_ssl_free_client_credentials (SoupSSLCredentials *client_creds)
 {
        ;
 }
 
-gpointer
+SoupSSLCredentials *
 soup_ssl_get_server_credentials (const char *cert_file, const char *key_file)
 {
        return NULL;
 }
 
 void
-soup_ssl_free_server_credentials (gpointer server_creds)
+soup_ssl_free_server_credentials (SoupSSLCredentials *server_creds)
 {
        ;
 }

diff --git a/tests/proxy-test.c b/tests/proxy-test.c
index a48db6d..1478797 100644 (file)
--- a/tests/proxy-test.c
+++ b/tests/proxy-test.c
@@ -111,11 +111,17 @@ run_test (int i, gboolean sync)
                https_url = g_strconcat (HTTPS_SERVER, tests[i].url, NULL);
        }
        test_url (http_url, SIMPLE_PROXY, tests[i].final_status, sync);
+#if HAVE_SSL
        test_url (https_url, SIMPLE_PROXY, tests[i].final_status, sync);
+#endif
        test_url (http_url, AUTH_PROXY, tests[i].final_status, sync);
+#if HAVE_SSL
        test_url (https_url, AUTH_PROXY, tests[i].final_status, sync);
+#endif
        test_url (http_url, UNAUTH_PROXY, tests[i].final_status, sync);
+#if HAVE_SSL
        test_url (https_url, UNAUTH_PROXY, tests[i].final_status, sync);
+#endif
 
        g_free (http_url);
        g_free (https_url);