diff options
Diffstat (limited to 'protocols/Gadu-Gadu')
-rw-r--r-- | protocols/Gadu-Gadu/src/gg.cpp | 4 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/gg.h | 1 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/events.cpp | 4 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/libgadu.cpp | 10 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/libgadu.h | 2 |
5 files changed, 6 insertions, 15 deletions
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index cb5bda1bc6..1ac8dae385 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -24,7 +24,6 @@ #include <errno.h>
// Other variables
-SSL_API sslApi;
CMPlugin g_plugin;
static unsigned long crc_table[256];
@@ -203,9 +202,6 @@ void GaduProto::cleanuplastplugin(DWORD version) //
static int gg_modulesloaded(WPARAM, LPARAM)
{
- // Get SSL API
- mir_getSI(&sslApi);
-
// File Association Manager support
gg_links_init();
diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h index a3f0a1278e..40b8ac3413 100644 --- a/protocols/Gadu-Gadu/src/gg.h +++ b/protocols/Gadu-Gadu/src/gg.h @@ -262,7 +262,6 @@ struct GaduProto; extern PLUGININFOEX pluginInfoEx;
extern IconItem iconList[];
-extern SSL_API sslApi;
/////////////////////////////////////////////////
// Methods
diff --git a/protocols/Gadu-Gadu/src/libgadu/events.cpp b/protocols/Gadu-Gadu/src/libgadu/events.cpp index 2374ade04c..078e19811e 100644 --- a/protocols/Gadu-Gadu/src/libgadu/events.cpp +++ b/protocols/Gadu-Gadu/src/libgadu/events.cpp @@ -69,8 +69,6 @@ #endif
#endif
-extern SSL_API sslApi;
-
/**
* Zwalnia pamięć zajmowaną przez informację o zdarzeniu.
*
@@ -795,7 +793,7 @@ struct gg_event *gg_watch_fd(struct gg_session *sess) {
gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_TLS_NEGOTIATION\n");
- sess->ssl = sslApi.connect(sess->fd, 0, 0);
+ sess->ssl = Netlib_SslConnect(sess->fd, 0, 0);
if (sess->ssl == NULL) {
gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() TLS negotiation failed\n");
diff --git a/protocols/Gadu-Gadu/src/libgadu/libgadu.cpp b/protocols/Gadu-Gadu/src/libgadu/libgadu.cpp index 931d55810d..405197401b 100644 --- a/protocols/Gadu-Gadu/src/libgadu/libgadu.cpp +++ b/protocols/Gadu-Gadu/src/libgadu/libgadu.cpp @@ -78,8 +78,6 @@ #endif
#endif
-extern SSL_API sslApi;
-
/**
* Port gniazda nasłuchującego dla połączeń bezpośrednich.
*
@@ -297,7 +295,7 @@ int gg_read(struct gg_session *sess, char *buf, int length) #ifdef GG_CONFIG_MIRANDA
if (sess->ssl != NULL)
- return sslApi.read(sess->ssl, buf, length, 0);
+ return Netlib_SslRead(sess->ssl, buf, length, 0);
#elif GG_CONFIG_HAVE_GNUTLS
if (sess->ssl != NULL) {
for (;;) {
@@ -376,7 +374,7 @@ static int gg_write_common(struct gg_session *sess, const char *buf, int length) #ifdef GG_CONFIG_MIRANDA
if (sess->ssl != NULL)
- return sslApi.write(sess->ssl, buf, length);
+ return Netlib_SslWrite(sess->ssl, buf, length);
#elif GG_CONFIG_HAVE_GNUTLS
if (sess->ssl != NULL) {
for (;;) {
@@ -1135,7 +1133,7 @@ void gg_logoff(struct gg_session *sess) #ifdef GG_CONFIG_MIRANDA
if (sess->ssl != NULL)
- sslApi.shutdown(sess->ssl);
+ Netlib_SslShutdown(sess->ssl);
#elif GG_CONFIG_HAVE_GNUTLS
if (sess->ssl != NULL)
gnutls_bye(GG_SESSION_GNUTLS(sess), GNUTLS_SHUT_RDWR);
@@ -1185,7 +1183,7 @@ void gg_free_session(struct gg_session *sess) #ifdef GG_CONFIG_MIRANDA
if (sess->ssl != NULL)
- sslApi.sfree(sess->ssl);
+ Netlib_SslFree(sess->ssl);
#elif GG_CONFIG_HAVE_GNUTLS
if (sess->ssl != NULL) {
gg_session_gnutls_t *tmp;
diff --git a/protocols/Gadu-Gadu/src/libgadu/libgadu.h b/protocols/Gadu-Gadu/src/libgadu/libgadu.h index 8c5e8e626a..0c269fefc7 100644 --- a/protocols/Gadu-Gadu/src/libgadu/libgadu.h +++ b/protocols/Gadu-Gadu/src/libgadu/libgadu.h @@ -37,7 +37,7 @@ #define GG_CONFIG_MIRANDA
#ifdef GG_CONFIG_MIRANDA
-#include <m_ssl.h>
+
#include <m_netlib.h>
#endif
|