pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16816] trunk/src/sslconn.c

[<dat...@us...>]

Revision: 16816
Author:   datallah
Date:     2006-08-17 08:19:12 -0700 (Thu, 17 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16816&view=rev

Log Message:
-----------
I will apologize in advance for this ugliness - it is necessary because we have a "connect" macro to cause the wgaim_connect() wrapper function to be used.

Modified Paths:
--------------
    trunk/src/sslconn.c
Modified: trunk/src/sslconn.c
===================================================================
--- trunk/src/sslconn.c	2006-08-17 14:07:20 UTC (rev 16815)
+++ trunk/src/sslconn.c	2006-08-17 15:19:12 UTC (rev 16816)
@@ -71,6 +71,7 @@
 {
 	GaimSslConnection *gsc;
 	GaimSslOps *ops;
+	void (*connect_func)(GaimSslConnection *gsc);
 
 	gsc = data;
 	gsc->connect_info = NULL;
@@ -87,7 +88,8 @@
 	gsc->fd = source;
 
 	ops = gaim_ssl_get_ops();
-	ops->connect(gsc);
+	connect_func = (ops->connect);
+	connect_func(gsc);
 }
 
 GaimSslConnection *
@@ -158,6 +160,7 @@
 {
 	GaimSslConnection *gsc;
 	GaimSslOps *ops;
+	void (*connect_func)(GaimSslConnection *gsc);
 
 	g_return_val_if_fail(fd != -1,                NULL);
 	g_return_val_if_fail(func != NULL,            NULL);
@@ -177,7 +180,8 @@
 	gsc->fd              = fd;
 
 	ops = gaim_ssl_get_ops();
-	ops->connect(gsc);
+	connect_func = ops->connect;
+	connect_func(gsc);
 
 	return (GaimSslConnection *)gsc;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16817] trunk/src/sslconn.c

[<dat...@us...>]

Revision: 16817
Author:   datallah
Date:     2006-08-17 08:46:58 -0700 (Thu, 17 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16817&view=rev

Log Message:
-----------
nosnilmot pointed out that I'm an idiot and this is a far less ugly way to achieve the same goal. (I swear I tried it first, but must have not actually saved the file when I tested it).

Modified Paths:
--------------
    trunk/src/sslconn.c
Modified: trunk/src/sslconn.c
===================================================================
--- trunk/src/sslconn.c	2006-08-17 15:19:12 UTC (rev 16816)
+++ trunk/src/sslconn.c	2006-08-17 15:46:58 UTC (rev 16817)
@@ -71,7 +71,6 @@
 {
 	GaimSslConnection *gsc;
 	GaimSslOps *ops;
-	void (*connect_func)(GaimSslConnection *gsc);
 
 	gsc = data;
 	gsc->connect_info = NULL;
@@ -88,8 +87,7 @@
 	gsc->fd = source;
 
 	ops = gaim_ssl_get_ops();
-	connect_func = (ops->connect);
-	connect_func(gsc);
+	(ops->connect)(gsc);
 }
 
 GaimSslConnection *
@@ -160,7 +158,6 @@
 {
 	GaimSslConnection *gsc;
 	GaimSslOps *ops;
-	void (*connect_func)(GaimSslConnection *gsc);
 
 	g_return_val_if_fail(fd != -1,                NULL);
 	g_return_val_if_fail(func != NULL,            NULL);
@@ -180,8 +177,7 @@
 	gsc->fd              = fd;
 
 	ops = gaim_ssl_get_ops();
-	connect_func = ops->connect;
-	connect_func(gsc);
+	(ops->connect)(gsc);
 
 	return (GaimSslConnection *)gsc;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.