Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/irc/parse.c Tue Oct 04 18:34:45 2011 +0000 +++ b/libpurple/protocols/irc/parse.c Wed Oct 05 07:33:20 2011 +0000 @@ -175,7 +175,7 @@ if (!gc) return PURPLE_CMD_RET_FAILED; - irc = gc->proto_data; + irc = purple_connection_get_protocol_data(gc); if ((cmdent = g_hash_table_lookup(irc->cmds, cmd)) == NULL) return PURPLE_CMD_RET_FAILED; @@ -670,11 +670,11 @@ } else if (!strncmp(input, "ERROR ", 6)) { if (g_utf8_validate(input, -1, NULL)) { char *tmp = g_strdup_printf("%s\n%s", _("Disconnected."), input); - purple_connection_error_reason (gc, + purple_connection_error (gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); g_free(tmp); } else - purple_connection_error_reason (gc, + purple_connection_error (gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Disconnected.")); return;