Mercurial > pidgin
changeset 23373:53db7393829e
merge of '3a93d6a9f17c32fb5379bb3f2294392fac142b92'
and '6258290c16427985f40258a4ca1be4e11feafc33'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 16 Jun 2008 01:03:23 +0000 |
| parents | 2a5bc3e6da7b (diff) 0efa36fe7d7c (current diff) |
| children | 85fc34efe733 63cfd4ea15ab |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/simple/simple.c Sun Jun 15 12:56:30 2008 +0000 +++ b/libpurple/protocols/simple/simple.c Mon Jun 16 01:03:23 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)