comparison: src/protocols/irc/irc.c
src/protocols/irc/irc.c
- changeset 6752
- 2a24550fd527
- parent 6695
- 2a63688f0d6d
- child 6787
- 7d8e0ba98f68
equal
deleted
inserted
replaced
| 6751:0edfd15b9f10 | 6752:2a24550fd527 |
|---|---|
| 139 const char *username = gaim_account_get_username(account); | 139 const char *username = gaim_account_get_username(account); |
| 140 int err; | 140 int err; |
| 141 | 141 |
| 142 gc = gaim_account_get_connection(account); | 142 gc = gaim_account_get_connection(account); |
| 143 | 143 |
| 144 if (strpbrk(username, " \t\v\r\n") != NULL) { | |
| 145 gaim_connection_error(gc, _("IRC nicks may not contain whitespace")); | |
| 146 return; | |
| 147 } | |
| 148 | |
| 144 gc->proto_data = irc = g_new0(struct irc_conn, 1); | 149 gc->proto_data = irc = g_new0(struct irc_conn, 1); |
| 145 irc->account = account; | 150 irc->account = account; |
| 146 | 151 |
| 147 userparts = g_strsplit(username, "@", 2); | 152 userparts = g_strsplit(username, "@", 2); |
| 148 gaim_connection_set_display_name(gc, userparts[0]); | 153 gaim_connection_set_display_name(gc, userparts[0]); |
| 217 } | 222 } |
| 218 | 223 |
| 219 static void irc_close(GaimConnection *gc) | 224 static void irc_close(GaimConnection *gc) |
| 220 { | 225 { |
| 221 struct irc_conn *irc = gc->proto_data; | 226 struct irc_conn *irc = gc->proto_data; |
| 227 | |
| 228 if (irc == NULL) | |
| 229 return; | |
| 222 | 230 |
| 223 irc_cmd_quit(irc, "quit", NULL, NULL); | 231 irc_cmd_quit(irc, "quit", NULL, NULL); |
| 224 | 232 |
| 225 if (gc->inpa) | 233 if (gc->inpa) |
| 226 g_source_remove(gc->inpa); | 234 g_source_remove(gc->inpa); |
