Mercurial > pidgin.yaz

comparison libpurple/protocols/simple/simple.c @ 32477:efe38e6319f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up SRV/TXT query functions. * Rename _account functions to their regular form. * Remove the unnecessary _cancel functions.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 02 Sep 2011 03:18:15 +0000
parents f22bc8b5b9dc
children cd1d9e04c587
comparison
equal deleted inserted replaced
32476:ba74745ff179 32477:efe38e6319f2
1968 hosttoconnect = sip->servername; 1968 hosttoconnect = sip->servername;
1969 } else { 1969 } else {
1970 hosttoconnect = purple_account_get_string(account, "proxy", sip->servername); 1970 hosttoconnect = purple_account_get_string(account, "proxy", sip->servername);
1971 } 1971 }
1972 1972
1973 sip->srv_query_data = purple_srv_resolve_account(account, "sip", 1973 sip->srv_query_data = purple_srv_resolve(account, "sip",
1974 sip->udp ? "udp" : "tcp", hosttoconnect, srvresolved, sip); 1974 sip->udp ? "udp" : "tcp", hosttoconnect, srvresolved, sip);
1975 } 1975 }
1976 1976
1977 static void simple_close(PurpleConnection *gc) 1977 static void simple_close(PurpleConnection *gc)
1978 { 1978 {
2005 purple_timeout_remove(sip->registertimeout); 2005 purple_timeout_remove(sip->registertimeout);
2006 if (sip->query_data != NULL) 2006 if (sip->query_data != NULL)
2007 purple_dnsquery_destroy(sip->query_data); 2007 purple_dnsquery_destroy(sip->query_data);
2008 2008
2009 if (sip->srv_query_data != NULL) 2009 if (sip->srv_query_data != NULL)
2010 purple_srv_cancel(sip->srv_query_data); 2010 purple_srv_txt_query_destroy(sip->srv_query_data);
2011 2011
2012 if (sip->listen_data != NULL) 2012 if (sip->listen_data != NULL)
2013 purple_network_listen_cancel(sip->listen_data); 2013 purple_network_listen_cancel(sip->listen_data);
2014 2014
2015 if (sip->fd >= 0) 2015 if (sip->fd >= 0)