Mercurial > pidgin
diff libgaim/protocols/oscar/oscar.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 <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 21 Aug 2006 05:25:44 +0000 |
parents | 60b1bc8dbf37 |
children | b8ca9c680d1a |
line wrap: on
line diff
--- a/libgaim/protocols/oscar/oscar.c Mon Aug 21 05:07:42 2006 +0000 +++ b/libgaim/protocols/oscar/oscar.c Mon Aug 21 05:25:44 2006 +0000 @@ -919,7 +919,7 @@ gc = od->gc; account = gaim_connection_get_account(gc); - conn->connect_info = NULL; + conn->connect_data = NULL; conn->fd = source; if (source < 0) @@ -972,8 +972,8 @@ } else if (conn->type == SNAC_FAMILY_CHAT) { - od->oscar_chats = g_slist_append(od->oscar_chats, conn->connect_data); - conn->connect_data = NULL; + od->oscar_chats = g_slist_append(od->oscar_chats, conn->new_conn_data); + conn->new_conn_data = NULL; } } @@ -1197,11 +1197,11 @@ gaim_prefs_connect_callback(gc, "/plugins/prpl/oscar/recent_buddies", recent_buddies_cb, gc); newconn = flap_connection_new(od, SNAC_FAMILY_AUTH); - newconn->connect_info = gaim_proxy_connect(account, + newconn->connect_data = gaim_proxy_connect(account, gaim_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER), gaim_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT), connection_established_cb, newconn); - if (newconn->connect_info == NULL) + if (newconn->connect_data == NULL) { gaim_connection_error(gc, _("Couldn't connect to host")); return; @@ -1314,10 +1314,10 @@ newconn = flap_connection_new(od, SNAC_FAMILY_LOCATE); newconn->cookielen = info->cookielen; newconn->cookie = g_memdup(info->cookie, info->cookielen); - newconn->connect_info = gaim_proxy_connect(account, host, port, + newconn->connect_data = gaim_proxy_connect(account, host, port, connection_established_cb, newconn); g_free(host); - if (newconn->connect_info == NULL) + if (newconn->connect_data == NULL) { gaim_connection_error(gc, _("Could Not Connect")); od->killme = TRUE; @@ -1609,13 +1609,13 @@ cc->exchange = redir->chat.exchange; cc->instance = redir->chat.instance; cc->show = extract_name(redir->chat.room); - newconn->connect_data = cc; + newconn->new_conn_data = cc; gaim_debug_info("oscar", "Connecting to chat room %s exchange %hu\n", cc->name, cc->exchange); } - newconn->connect_info = gaim_proxy_connect(account, host, port, + newconn->connect_data = gaim_proxy_connect(account, host, port, connection_established_cb, newconn); - if (newconn->connect_info == NULL) + if (newconn->connect_data == NULL) { flap_connection_schedule_destroy(newconn, OSCAR_DISCONNECT_COULD_NOT_CONNECT); gaim_debug_error("oscar", "Unable to connect to FLAP server "