Mercurial > pidgin
diff libpurple/protocols/sametime/sametime.c @ 25890:43b721aa4b76
explicit merge of '32d4ce0b6cfc9ccb9a6e7ed661423b9260a0bead'
and '0bcc8cd8e68241cf9c13be5b28ced3a4a5d4e488'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 02 Jan 2009 22:28:34 +0000 |
parents | f8dbd57cf635 4455637864b4 |
children | 2d4f0dd04334 |
line wrap: on
line diff
--- a/libpurple/protocols/sametime/sametime.c Fri Jan 02 22:23:58 2009 +0000 +++ b/libpurple/protocols/sametime/sametime.c Fri Jan 02 22:28:34 2009 +0000 @@ -3741,7 +3741,6 @@ gc->flags |= PURPLE_CONNECTION_NO_IMAGES; user = g_strdup(purple_account_get_username(account)); - pass = g_strdup(purple_account_get_password(account)); host = strrchr(user, ':'); if(host) { @@ -3758,10 +3757,12 @@ if(! host || ! *host) { /* somehow, we don't have a host to connect to. Well, we need one to actually continue, so let's ask the user directly. */ + g_free(user); prompt_host(gc); return; } + pass = g_strdup(purple_account_get_password(account)); port = purple_account_get_int(account, MW_KEY_PORT, MW_PLUGIN_DEFAULT_PORT); DEBUG_INFO("user: '%s'\n", user);