summaryrefslogtreecommitdiff
path: root/gabble
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-08-03 15:23:52 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-08-03 15:57:47 +0100
commit43d4cc6ecefcff87388591ba8414e8f59b42160e (patch)
tree27d3c5122260462c9ee519816cec9ed297734376 /gabble
parent1df648789abc5a99e9df47a44657a739f6157964 (diff)
gabble_set_tp_conn_error_from_wocky: be sensitive to previous status
This moves the domain-specific special case from connection.c:remote_error_cb to more generic error-handling code. I'd previously thought that a stream <conflict/> before connecting successfully would be a WOCKY_CONNECTOR_ERROR, but that turns out not to be true.
Diffstat (limited to 'gabble')
-rw-r--r--gabble/error.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/gabble/error.h b/gabble/error.h
index 026f7dc33..8563bf13b 100644
--- a/gabble/error.h
+++ b/gabble/error.h
@@ -31,6 +31,7 @@ void gabble_set_tp_error_from_wocky (const GError *wocky_error,
GError **error);
void gabble_set_tp_conn_error_from_wocky (const GError *wocky_error,
+ TpConnectionStatus previous_status,
TpConnectionStatusReason *conn_reason,
GError **error);