Mercurial > pidgin.yaz
comparison libpurple/protocols/irc/parse.c @ 32724:44fc11beefab
propagate from branch 'im.pidgin.pidgin.2.x.y' (head b9c74c3f836a7a1a64710fc8244c9ec1f3f21b97)
to branch 'im.pidgin.pidgin' (head fcd1b3766ec3998ed589bfddde2bffefd9d99e65)
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 05 Oct 2011 07:33:20 +0000 |
parents | 062f5781aa57 cf796628b2c0 |
children | 3e7a7e14af62 |
comparison
equal
deleted
inserted
replaced
32723:952120a8ee02 | 32724:44fc11beefab |
---|---|
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 |