comparison libpurple/dnssrv.c @ 32477:efe38e6319f2

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 9ed25c58e7ce
children
comparison
equal deleted inserted replaced
32476:ba74745ff179 32477:efe38e6319f2
723 } 723 }
724 724
725 #endif 725 #endif
726 726
727 PurpleSrvTxtQueryData * 727 PurpleSrvTxtQueryData *
728 purple_srv_resolve(const char *protocol, const char *transport, 728 purple_srv_resolve(PurpleAccount *account, const char *protocol,
729 const char *domain, PurpleSrvCallback cb, gpointer extradata)
730 {
731 return purple_srv_resolve_account(NULL, protocol, transport, domain,
732 cb, extradata);
733 }
734
735 PurpleSrvTxtQueryData *
736 purple_srv_resolve_account(PurpleAccount *account, const char *protocol,
737 const char *transport, const char *domain, PurpleSrvCallback cb, 729 const char *transport, const char *domain, PurpleSrvCallback cb,
738 gpointer extradata) 730 gpointer extradata)
739 { 731 {
740 char *query; 732 char *query;
741 char *hostname; 733 char *hostname;
867 859
868 return query_data; 860 return query_data;
869 #endif 861 #endif
870 } 862 }
871 863
872 PurpleSrvTxtQueryData *purple_txt_resolve(const char *owner, 864 PurpleSrvTxtQueryData *purple_txt_resolve(PurpleAccount *account,
873 const char *domain, PurpleTxtCallback cb, gpointer extradata)
874 {
875 return purple_txt_resolve_account(NULL, owner, domain, cb, extradata);
876 }
877
878 PurpleSrvTxtQueryData *purple_txt_resolve_account(PurpleAccount *account,
879 const char *owner, const char *domain, PurpleTxtCallback cb, 865 const char *owner, const char *domain, PurpleTxtCallback cb,
880 gpointer extradata) 866 gpointer extradata)
881 { 867 {
882 char *query; 868 char *query;
883 char *hostname; 869 char *hostname;
1004 990
1005 return query_data; 991 return query_data;
1006 #endif 992 #endif
1007 } 993 }
1008 994
1009 void
1010 purple_txt_cancel(PurpleSrvTxtQueryData *query_data)
1011 {
1012 purple_srv_txt_query_destroy(query_data);
1013 }
1014
1015 void
1016 purple_srv_cancel(PurpleSrvTxtQueryData *query_data)
1017 {
1018 purple_srv_txt_query_destroy(query_data);
1019 }
1020
1021 const gchar * 995 const gchar *
1022 purple_txt_response_get_content(PurpleTxtResponse *resp) 996 purple_txt_response_get_content(PurpleTxtResponse *resp)
1023 { 997 {
1024 g_return_val_if_fail(resp != NULL, NULL); 998 g_return_val_if_fail(resp != NULL, NULL);
1025 999