diff libgaim/protocols/sametime/sametime.c @ 14262:baff095b146c

[gaim-migrate @ 16944] Rename GaimProxyConnectInfo to GaimProxyConnectData, and change the variables from connect_info to connect_data. Sorry, but I wanted to get this right before it becomes permanent. committer: Tailor Script <[e-mail]>

--- a/libgaim/protocols/sametime/sametime.c	Mon Aug 21 05:07:42 2006 +0000
+++ b/libgaim/protocols/sametime/sametime.c	Mon Aug 21 05:25:44 2006 +0000
@@ -226,7 +226,7 @@
   /** socket fd */
   int socket;
   gint outpa;  /* like inpa, but the other way */
-  GaimProxyConnectInfo *connect_info;
+  GaimProxyConnectData *connect_data;
 
   /** circular buffer for outgoing data */
   GaimCircBuffer *sock_buf;
@@ -1675,7 +1675,7 @@
   struct mwGaimPluginData *pd = data;
   GaimConnection *gc = pd->gc;
 
-  pd->connect_info = NULL;
+  pd->connect_data = NULL;
 
   if(source < 0) {
     /* connection failed */
@@ -3681,8 +3681,8 @@
 
   gaim_connection_update_progress(gc, _("Connecting"), 1, MW_CONNECT_STEPS);
 
-  pd->connect_info = gaim_proxy_connect(account, host, port, connect_cb, pd);
-  if(pd->connect_info == NULL) {
+  pd->connect_data = gaim_proxy_connect(account, host, port, connect_cb, pd);
+  if(pd->connect_data == NULL) {
     gaim_connection_error(gc, _("Unable to connect to host"));
   }
 }
@@ -3715,9 +3715,9 @@
     gc->inpa = 0;
   }
 
-  if(pd->connect_info != NULL) {
-    gaim_proxy_connect_cancel(pd->connect_info);
-    pd->connect_info = NULL;
+  if(pd->connect_data != NULL) {
+    gaim_proxy_connect_cancel(pd->connect_data);
+    pd->connect_data = NULL;
   }
 
   /* clean up the rest */