comparison: libpurple/protocols/irc/parse.c
libpurple/protocols/irc/parse.c
- changeset 32635
- e5450a0ecde6
- parent 32047
- 42d2acf32425
- parent 32276
- abc0b7c0cb86
- child 32698
- 154e4a2a6287
equal
deleted
inserted
replaced
| 32050:cfe7f9066963 | 32635:e5450a0ecde6 |
|---|---|
| 173 | 173 |
| 174 gc = purple_conversation_get_gc(conv); | 174 gc = purple_conversation_get_gc(conv); |
| 175 if (!gc) | 175 if (!gc) |
| 176 return PURPLE_CMD_RET_FAILED; | 176 return PURPLE_CMD_RET_FAILED; |
| 177 | 177 |
| 178 irc = gc->proto_data; | 178 irc = purple_connection_get_protocol_data(gc); |
| 179 | 179 |
| 180 if ((cmdent = g_hash_table_lookup(irc->cmds, cmd)) == NULL) | 180 if ((cmdent = g_hash_table_lookup(irc->cmds, cmd)) == NULL) |
| 181 return PURPLE_CMD_RET_FAILED; | 181 return PURPLE_CMD_RET_FAILED; |
| 182 | 182 |
| 183 (cmdent->cb)(irc, cmd, purple_conversation_get_name(conv), (const char **)args); | 183 (cmdent->cb)(irc, cmd, purple_conversation_get_name(conv), (const char **)args); |
| 668 g_free(msg); | 668 g_free(msg); |
| 669 return; | 669 return; |
| 670 } else if (!strncmp(input, "ERROR ", 6)) { | 670 } else if (!strncmp(input, "ERROR ", 6)) { |
| 671 if (g_utf8_validate(input, -1, NULL)) { | 671 if (g_utf8_validate(input, -1, NULL)) { |
| 672 char *tmp = g_strdup_printf("%s\n%s", _("Disconnected."), input); | 672 char *tmp = g_strdup_printf("%s\n%s", _("Disconnected."), input); |
| 673 purple_connection_error_reason (gc, | 673 purple_connection_error (gc, |
| 674 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); | 674 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); |
| 675 g_free(tmp); | 675 g_free(tmp); |
| 676 } else | 676 } else |
| 677 purple_connection_error_reason (gc, | 677 purple_connection_error (gc, |
| 678 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, | 678 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
| 679 _("Disconnected.")); | 679 _("Disconnected.")); |
| 680 return; | 680 return; |
| 681 } | 681 } |
| 682 | 682 |
