Mercurial > pidgin.yaz
diff libpurple/protocols/zephyr/zephyr.c @ 32327:c80ac2d937b7
Change last remaining users of purple_connection_error to use
purple_connection_error_reason. The "reason" I used in this code
is probably not the most appropriate reason. My goal was to retain
the same behavior before and after this change.
It's not a bad idea for someone to look at each of these calls and
determine if a different reason should be used... but it hasn't seemed
to cause problems so far, so maybe it doesn't matter.
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 21 Aug 2011 07:49:24 +0000 |
parents | 5d442ea707b5 |
children | a5b556ac1de5 |
line wrap: on
line diff
--- a/libpurple/protocols/zephyr/zephyr.c Sun Aug 21 07:37:07 2011 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Sun Aug 21 07:49:24 2011 +0000 @@ -146,7 +146,7 @@ return TRUE; #define z_call_s(func, err) if (func != ZERR_NONE) {\ - purple_connection_error(gc, err);\ + purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, err);\ return;\ } @@ -1585,7 +1585,7 @@ /* XXX z_call_s should actually try to report the com_err determined error */ if (use_tzc(zephyr)) { pid_t pid; - /* purple_connection_error(gc,"tzc not supported yet"); */ + /* purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "tzc not supported yet"); */ if ((pipe(zephyr->totzc) != 0) || (pipe(zephyr->fromtzc) != 0)) { purple_debug_error("zephyr", "pipe creation failed. killing\n"); exit(-1); @@ -1706,7 +1706,7 @@ ptr++; } if (ptr >=bufcur) { - purple_connection_error(gc,"invalid output by tzc (or bad parsing code)"); + purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "invalid output by tzc (or bad parsing code)"); free(buf); return; } @@ -1821,7 +1821,7 @@ purple_debug_info("zephyr","realm: %s\n",zephyr->realm); } else { - purple_connection_error(gc,"Only ZEPH0.2 supported currently"); + purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "Only ZEPH0.2 supported currently"); return; } purple_debug_info("zephyr","does it get here\n");