# HG changeset patch # User Mark Doliner # Date 1155880697 0 # Node ID db2d55d332d61be8f8222f4065abef8831162c84 # Parent 00f4e261e5f05fe5e4e854473fa853ccac2c28f7 [gaim-migrate @ 16829] Just rename connect to connectfunc. This is what it was like before my changes. Now I know why! committer: Tailor Script diff -r 00f4e261e5f0 -r db2d55d332d6 src/sslconn.c --- a/src/sslconn.c Fri Aug 18 05:56:10 2006 +0000 +++ b/src/sslconn.c Fri Aug 18 05:58:17 2006 +0000 @@ -46,7 +46,7 @@ ops = gaim_ssl_get_ops(); if ((ops == NULL) || (ops->init == NULL) || (ops->uninit == NULL) || - (ops->connect == NULL) || (ops->close == NULL) || + (ops->connectfunc == NULL) || (ops->close == NULL) || (ops->read == NULL) || (ops->write == NULL)) { return FALSE; @@ -87,7 +87,7 @@ gsc->fd = source; ops = gaim_ssl_get_ops(); - (ops->connect)(gsc); + ops->connectfunc(gsc); } GaimSslConnection * @@ -177,7 +177,7 @@ gsc->fd = fd; ops = gaim_ssl_get_ops(); - (ops->connect)(gsc); + ops->connectfunc(gsc); return (GaimSslConnection *)gsc; } diff -r 00f4e261e5f0 -r db2d55d332d6 src/sslconn.h --- a/src/sslconn.h Fri Aug 18 05:56:10 2006 +0000 +++ b/src/sslconn.h Fri Aug 18 05:58:17 2006 +0000 @@ -68,7 +68,7 @@ { gboolean (*init)(void); void (*uninit)(void); - void (*connect)(GaimSslConnection *gsc); + void (*connectfunc)(GaimSslConnection *gsc); void (*close)(GaimSslConnection *gsc); size_t (*read)(GaimSslConnection *gsc, void *data, size_t len); size_t (*write)(GaimSslConnection *gsc, const void *data, size_t len);