# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1213578203 0
# Node ID 53db7393829e72c713b0fbf01ef9193293b68c60
# Parent  2a5bc3e6da7bb1719d0a12d6a18e368e227e19e4# Parent  0efa36fe7d7c423add64c789481838b35888337c
merge of '3a93d6a9f17c32fb5379bb3f2294392fac142b92'
     and '6258290c16427985f40258a4ca1be4e11feafc33'

diff -r 0efa36fe7d7c -r 53db7393829e libpurple/protocols/simple/simple.c
--- 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)