Mercurial > pidgin
changeset 23359:2a5bc3e6da7b
merge of '705949560fe813ff0ffc4170eb4ca7545d1bd4e4'
and 'ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 13 Jun 2008 18:35:25 +0000 |
| parents | 6b09c40a15d1 (diff) da78db9f188f (current diff) |
| children | 53db7393829e |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/simple/simple.c Fri Jun 13 04:57:45 2008 +0000 +++ b/libpurple/protocols/simple/simple.c Fri Jun 13 18:35:25 2008 +0000 @@ -1898,7 +1898,7 @@ PurpleConnection *gc; struct simple_account_data *sip; gchar **userserver; - gchar *hosttoconnect; + const gchar *hosttoconnect; const char *username = purple_account_get_username(account); gc = purple_account_get_connection(account); @@ -1934,14 +1934,13 @@ sip->status = g_strdup("available"); if(!purple_account_get_bool(account, "useproxy", FALSE)) { - hosttoconnect = g_strdup(sip->servername); + hosttoconnect = sip->servername; } else { - hosttoconnect = g_strdup(purple_account_get_string(account, "proxy", sip->servername)); + hosttoconnect = purple_account_get_string(account, "proxy", sip->servername); } sip->srv_query_data = purple_srv_resolve("sip", sip->udp ? "udp" : "tcp", hosttoconnect, srvresolved, sip); - g_free(hosttoconnect); } static void simple_close(PurpleConnection *gc)