Mercurial > pidgin
comparison libpurple/connection.c @ 26068:f95aa2b14bec
propagate from branch 'im.pidgin.pidgin' (head 96db74f0ccbe2a283893e33f0f7bff5a827f48d9)
to branch 'im.pidgin.pidgin.vv' (head 55aa623e09a7429df54b4e068dcba4c67c5fe779)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Fri, 30 Jan 2009 08:58:07 +0000 |
| parents | 43a093eb913f |
| children | 3d8c53f3108e |
comparison
equal
deleted
inserted
replaced
| 26067:a6e53d23bcbb | 26068:f95aa2b14bec |
|---|---|
| 543 "valid reason\n", reason); | 543 "valid reason\n", reason); |
| 544 reason = PURPLE_CONNECTION_ERROR_OTHER_ERROR; | 544 reason = PURPLE_CONNECTION_ERROR_OTHER_ERROR; |
| 545 } | 545 } |
| 546 | 546 |
| 547 if (description == NULL) { | 547 if (description == NULL) { |
| 548 purple_debug_error("connection", "purple_connection_error_reason: check `description != NULL' failed\n"); | 548 purple_debug_error("connection", "purple_connection_error_reason called with NULL description\n"); |
| 549 description = _("Unknown error"); | 549 description = _("Unknown error"); |
| 550 } | 550 } |
| 551 | 551 |
| 552 /* If we've already got one error, we don't need any more */ | 552 /* If we've already got one error, we don't need any more */ |
| 553 if (gc->disconnect_timeout) | 553 if (gc->disconnect_timeout) |