diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-01-27 21:39:44 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-01-27 22:16:00 +0000 |
| commit | 9fed5574a65c7d7318cd1c86e7e9ffc741139966 (patch) | |
| tree | 46b0f3eb5503ef63978475fc7ea4a2be5cfd8c56 /src/bytestream-factory.c | |
| parent | cea17f274de06f7a7db6bcc68fa10cbdc083feb6 (diff) | |
| download | telepathy-gabble-9fed5574a65c7d7318cd1c86e7e9ffc741139966.tar.gz | |
Remove LmHandlerResult
The callback type for _gabble_connection_send_with_reply returned one of
these. All instances, bar two, returned
LM_HANDLER_RESULT_REMOVE_MESSAGE, which makes sense, because if you send
an IQ you had better be prepared to handle the reply.
When I removed lm_connection_send_with_reply(), I stopped
_gabble_connection_send_with_reply() paying attention to the return
value, with no apparent ill effects.
The two which returned LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS were:
• the disco pipeline's reply handler, in the case where the request is
no longer in the pipeline (such as in a timeout). I checked, and as
far as I can tell nothing is trying to scrape any information out of
zombie disco replies.
• the request pipeline's reply handler, in the same case. I couldn't be
bothered to check for this, but I don't think it will pose any ill
effects because normally the handler is the highest-priority
callback, so anyone trying to catch these would not catch the ones
which were not cancelled… which seems unlikely.
Diffstat (limited to 'src/bytestream-factory.c')
| -rw-r--r-- | src/bytestream-factory.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c index 22533f7a9..37f411765 100644 --- a/src/bytestream-factory.c +++ b/src/bytestream-factory.c @@ -298,7 +298,7 @@ add_proxy_to_list (GabbleBytestreamFactory *self, *list = g_slist_prepend (*list, proxy); } -static LmHandlerResult +static void socks5_proxy_query_reply_cb (GabbleConnection *conn, WockyStanza *sent_msg, WockyStanza *reply_msg, @@ -349,7 +349,7 @@ socks5_proxy_query_reply_cb (GabbleConnection *conn, add_proxy_to_list (self , proxy, fallback); - return LM_HANDLER_RESULT_REMOVE_MESSAGE; + return; fail: if (fallback && from != NULL) @@ -370,7 +370,6 @@ fail: /* Try to get another proxy as this one failed */ query_proxies (self, 1); - return LM_HANDLER_RESULT_REMOVE_MESSAGE; } static void @@ -2018,7 +2017,7 @@ negotiate_stream_object_destroy_notify_cb (gpointer _data, } /* Called when we receive the reply of a SI request */ -static LmHandlerResult +static void streaminit_reply_cb (GabbleConnection *conn, WockyStanza *sent_msg, WockyStanza *reply_msg, @@ -2164,8 +2163,6 @@ END: g_free (self_jid); g_free (data->stream_id); g_slice_free (struct _streaminit_reply_cb_data, data); - - return LM_HANDLER_RESULT_REMOVE_MESSAGE; } /* |