From: <the...@us...> - 2006-04-22 15:14:00
|
Revision: 16080 Author: thekingant Date: 2006-04-22 08:13:51 -0700 (Sat, 22 Apr 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16080&view=rev Log Message: ----------- Set the SIP/SIMPLE user-agent string to something more that I think makes more sense, and set wants_to_die in two places when disconnecting. This causes the account to be disable until the user re-enables it. Modified Paths: -------------- trunk/src/protocols/simple/simple.c Modified: trunk/src/protocols/simple/simple.c =================================================================== --- trunk/src/protocols/simple/simple.c 2006-04-22 15:11:07 UTC (rev 16079) +++ trunk/src/protocols/simple/simple.c 2006-04-22 15:13:51 UTC (rev 16080) @@ -624,7 +624,7 @@ "To: <%s>%s%s\r\n" "Max-Forwards: 10\r\n" "CSeq: %d %s\r\n" - "User-Agent: Gaim SIP/SIMPLE Plugin\r\n" + "User-Agent: Gaim/" VERSION "\r\n" "Call-ID: %s\r\n" "%s%s" "Content-Length: %" G_GSIZE_FORMAT "\r\n\r\n%s", @@ -992,6 +992,7 @@ if(sip->registerstatus != 2) { gaim_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries); if(sip->registrar.retries > 3) { + sip->gc->wants_to_die = TRUE; gaim_connection_error(sip->gc, _("Wrong Password")); return TRUE; } @@ -1581,6 +1582,7 @@ gc = gaim_account_get_connection(account); if (strpbrk(username, " \t\v\r\n") != NULL) { + gc->wants_to_die = TRUE; gaim_connection_error(gc, _("SIP usernames may not contain whitespaces or @ symbols")); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |