Mercurial > pidgin
comparison libpurple/protocols/irc/irc.c @ 26987:cd78ea46e9bd
merge of '7c614b09b72037ebd86c03fbbeac7794a155547b'
and 'af18689b86389686230fc6ce83cbba52690ce0cb'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 30 May 2009 00:32:50 +0000 |
| parents | da9d25c582c1 |
| children | 2873ee6a960d |
comparison
equal
deleted
inserted
replaced
| 26986:42bff519973b | 26987:cd78ea46e9bd |
|---|---|
| 304 gc->flags |= PURPLE_CONNECTION_NO_NEWLINES; | 304 gc->flags |= PURPLE_CONNECTION_NO_NEWLINES; |
| 305 | 305 |
| 306 if (strpbrk(username, " \t\v\r\n") != NULL) { | 306 if (strpbrk(username, " \t\v\r\n") != NULL) { |
| 307 purple_connection_error_reason (gc, | 307 purple_connection_error_reason (gc, |
| 308 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, | 308 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, |
| 309 _("IRC nicks may not contain whitespace")); | 309 _("IRC nick and server may not contain whitespace")); |
| 310 return; | 310 return; |
| 311 } | 311 } |
| 312 | 312 |
| 313 gc->proto_data = irc = g_new0(struct irc_conn, 1); | 313 gc->proto_data = irc = g_new0(struct irc_conn, 1); |
| 314 irc->fd = -1; | 314 irc->fd = -1; |