Mercurial > pidgin
changeset 31448:1ae16c9b2164
merge of '840e5251829610a4d5500832438e6086f442148c'
and 'e357c34b0d64535b96825a863bbd90aec7a71880'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 06 Apr 2011 13:36:26 +0000 |
| parents | 1a248102e437 (diff) a0b9ecdc98c4 (current diff) |
| children | 7db33b356d4a |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/irc/irc.c Wed Apr 06 13:35:53 2011 +0000 +++ b/libpurple/protocols/irc/irc.c Wed Apr 06 13:36:26 2011 +0000 @@ -403,8 +403,7 @@ static gboolean do_login(PurpleConnection *gc) { char *buf, *tmp = NULL; - char *hostname, *server; - const char *hosttmp; + char *server; const char *username, *realname; struct irc_conn *irc = gc->proto_data; const char *pass = purple_connection_get_password(gc); @@ -432,17 +431,6 @@ } } - hosttmp = purple_get_host_name(); - if (*hosttmp == ':') { - /* This is either an IPv6 address, or something which - * doesn't belong here. Either way, we need to escape - * it. */ - hostname = g_strdup_printf("0%s", hosttmp); - } else { - /* Ugly, I know. */ - hostname = g_strdup(hosttmp); - } - if (*irc->server == ':') { /* Same as hostname, above. */ server = g_strdup_printf("0%s", irc->server); @@ -450,10 +438,9 @@ server = g_strdup(irc->server); } - buf = irc_format(irc, "vvvv:", "USER", tmp ? tmp : username, hostname, server, + buf = irc_format(irc, "vvvv:", "USER", tmp ? tmp : username, "*", server, strlen(realname) ? realname : IRC_DEFAULT_ALIAS); g_free(tmp); - g_free(hostname); g_free(server); if (irc_send(irc, buf) < 0) { g_free(buf);