comparison libgaim/protocols/msn/httpconn.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 118fd0dc5b6e
comparison
equal deleted inserted replaced
14261:bb060cdc23d1 14262:baff095b146c
696 connect_cb(gpointer data, gint source, const gchar *error_message) 696 connect_cb(gpointer data, gint source, const gchar *error_message)
697 { 697 {
698 MsnHttpConn *httpconn; 698 MsnHttpConn *httpconn;
699 699
700 httpconn = data; 700 httpconn = data;
701 httpconn->connect_info = NULL; 701 httpconn->connect_data = NULL;
702 httpconn->fd = source; 702 httpconn->fd = source;
703 703
704 if (source >= 0) 704 if (source >= 0)
705 { 705 {
706 httpconn->inpa = gaim_input_add(httpconn->fd, GAIM_INPUT_READ, 706 httpconn->inpa = gaim_input_add(httpconn->fd, GAIM_INPUT_READ,
725 g_return_val_if_fail(port > 0, FALSE); 725 g_return_val_if_fail(port > 0, FALSE);
726 726
727 if (httpconn->connected) 727 if (httpconn->connected)
728 msn_httpconn_disconnect(httpconn); 728 msn_httpconn_disconnect(httpconn);
729 729
730 httpconn->connect_info = gaim_proxy_connect(httpconn->session->account, 730 httpconn->connect_data = gaim_proxy_connect(httpconn->session->account,
731 "gateway.messenger.hotmail.com", 80, connect_cb, httpconn); 731 "gateway.messenger.hotmail.com", 80, connect_cb, httpconn);
732 732
733 if (httpconn->connect_info != NULL) 733 if (httpconn->connect_data != NULL)
734 { 734 {
735 httpconn->waiting_response = TRUE; 735 httpconn->waiting_response = TRUE;
736 httpconn->connected = TRUE; 736 httpconn->connected = TRUE;
737 } 737 }
738 738
745 g_return_if_fail(httpconn != NULL); 745 g_return_if_fail(httpconn != NULL);
746 746
747 if (!httpconn->connected) 747 if (!httpconn->connected)
748 return; 748 return;
749 749
750 if (httpconn->connect_info != NULL) 750 if (httpconn->connect_data != NULL)
751 { 751 {
752 gaim_proxy_connect_cancel(httpconn->connect_info); 752 gaim_proxy_connect_cancel(httpconn->connect_data);
753 httpconn->connect_info = NULL; 753 httpconn->connect_data = NULL;
754 } 754 }
755 755
756 if (httpconn->timer) 756 if (httpconn->timer)
757 { 757 {
758 gaim_timeout_remove(httpconn->timer); 758 gaim_timeout_remove(httpconn->timer);