Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
14261:bb060cdc23d1 | 14262:baff095b146c |
---|---|
917 conn = data; | 917 conn = data; |
918 od = conn->od; | 918 od = conn->od; |
919 gc = od->gc; | 919 gc = od->gc; |
920 account = gaim_connection_get_account(gc); | 920 account = gaim_connection_get_account(gc); |
921 | 921 |
922 conn->connect_info = NULL; | 922 conn->connect_data = NULL; |
923 conn->fd = source; | 923 conn->fd = source; |
924 | 924 |
925 if (source < 0) | 925 if (source < 0) |
926 { | 926 { |
927 gaim_debug_error("oscar", "unable to connect FLAP server " | 927 gaim_debug_error("oscar", "unable to connect FLAP server " |
970 gaim_connection_update_progress(gc, _("Connection established, cookie sent"), 4, OSCAR_CONNECT_STEPS); | 970 gaim_connection_update_progress(gc, _("Connection established, cookie sent"), 4, OSCAR_CONNECT_STEPS); |
971 ck[4] = 0x61; | 971 ck[4] = 0x61; |
972 } | 972 } |
973 else if (conn->type == SNAC_FAMILY_CHAT) | 973 else if (conn->type == SNAC_FAMILY_CHAT) |
974 { | 974 { |
975 od->oscar_chats = g_slist_append(od->oscar_chats, conn->connect_data); | 975 od->oscar_chats = g_slist_append(od->oscar_chats, conn->new_conn_data); |
976 conn->connect_data = NULL; | 976 conn->new_conn_data = NULL; |
977 } | 977 } |
978 } | 978 } |
979 | 979 |
980 static void | 980 static void |
981 flap_connection_established_bos(OscarData *od, FlapConnection *conn) | 981 flap_connection_established_bos(OscarData *od, FlapConnection *conn) |
1195 | 1195 |
1196 /* Connect to core Gaim signals */ | 1196 /* Connect to core Gaim signals */ |
1197 gaim_prefs_connect_callback(gc, "/plugins/prpl/oscar/recent_buddies", recent_buddies_cb, gc); | 1197 gaim_prefs_connect_callback(gc, "/plugins/prpl/oscar/recent_buddies", recent_buddies_cb, gc); |
1198 | 1198 |
1199 newconn = flap_connection_new(od, SNAC_FAMILY_AUTH); | 1199 newconn = flap_connection_new(od, SNAC_FAMILY_AUTH); |
1200 newconn->connect_info = gaim_proxy_connect(account, | 1200 newconn->connect_data = gaim_proxy_connect(account, |
1201 gaim_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER), | 1201 gaim_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER), |
1202 gaim_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT), | 1202 gaim_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT), |
1203 connection_established_cb, newconn); | 1203 connection_established_cb, newconn); |
1204 if (newconn->connect_info == NULL) | 1204 if (newconn->connect_data == NULL) |
1205 { | 1205 { |
1206 gaim_connection_error(gc, _("Couldn't connect to host")); | 1206 gaim_connection_error(gc, _("Couldn't connect to host")); |
1207 return; | 1207 return; |
1208 } | 1208 } |
1209 | 1209 |
1312 } | 1312 } |
1313 host = g_strndup(info->bosip, i); | 1313 host = g_strndup(info->bosip, i); |
1314 newconn = flap_connection_new(od, SNAC_FAMILY_LOCATE); | 1314 newconn = flap_connection_new(od, SNAC_FAMILY_LOCATE); |
1315 newconn->cookielen = info->cookielen; | 1315 newconn->cookielen = info->cookielen; |
1316 newconn->cookie = g_memdup(info->cookie, info->cookielen); | 1316 newconn->cookie = g_memdup(info->cookie, info->cookielen); |
1317 newconn->connect_info = gaim_proxy_connect(account, host, port, | 1317 newconn->connect_data = gaim_proxy_connect(account, host, port, |
1318 connection_established_cb, newconn); | 1318 connection_established_cb, newconn); |
1319 g_free(host); | 1319 g_free(host); |
1320 if (newconn->connect_info == NULL) | 1320 if (newconn->connect_data == NULL) |
1321 { | 1321 { |
1322 gaim_connection_error(gc, _("Could Not Connect")); | 1322 gaim_connection_error(gc, _("Could Not Connect")); |
1323 od->killme = TRUE; | 1323 od->killme = TRUE; |
1324 return 0; | 1324 return 0; |
1325 } | 1325 } |
1607 cc->gc = gc; | 1607 cc->gc = gc; |
1608 cc->name = g_strdup(redir->chat.room); | 1608 cc->name = g_strdup(redir->chat.room); |
1609 cc->exchange = redir->chat.exchange; | 1609 cc->exchange = redir->chat.exchange; |
1610 cc->instance = redir->chat.instance; | 1610 cc->instance = redir->chat.instance; |
1611 cc->show = extract_name(redir->chat.room); | 1611 cc->show = extract_name(redir->chat.room); |
1612 newconn->connect_data = cc; | 1612 newconn->new_conn_data = cc; |
1613 gaim_debug_info("oscar", "Connecting to chat room %s exchange %hu\n", cc->name, cc->exchange); | 1613 gaim_debug_info("oscar", "Connecting to chat room %s exchange %hu\n", cc->name, cc->exchange); |
1614 } | 1614 } |
1615 | 1615 |
1616 newconn->connect_info = gaim_proxy_connect(account, host, port, | 1616 newconn->connect_data = gaim_proxy_connect(account, host, port, |
1617 connection_established_cb, newconn); | 1617 connection_established_cb, newconn); |
1618 if (newconn->connect_info == NULL) | 1618 if (newconn->connect_data == NULL) |
1619 { | 1619 { |
1620 flap_connection_schedule_destroy(newconn, OSCAR_DISCONNECT_COULD_NOT_CONNECT); | 1620 flap_connection_schedule_destroy(newconn, OSCAR_DISCONNECT_COULD_NOT_CONNECT); |
1621 gaim_debug_error("oscar", "Unable to connect to FLAP server " | 1621 gaim_debug_error("oscar", "Unable to connect to FLAP server " |
1622 "of type 0x%04hx\n", redir->group); | 1622 "of type 0x%04hx\n", redir->group); |
1623 } | 1623 } |