diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2010-05-03 19:24:08 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2010-05-03 19:24:08 +0100 |
| commit | 9b4c1b8828c0ff250d62f735de39b469ebcea89a (patch) | |
| tree | 0be820806bfae98477ec09eb6dca11edfa5c8e6b /src/search-channel.c | |
| parent | 9cda4a945425dc799c433ea51a6c655287650f80 (diff) | |
| download | telepathy-gabble-9b4c1b8828c0ff250d62f735de39b469ebcea89a.tar.gz | |
Search: Correctly handle replies lacking <x/>
Diffstat (limited to 'src/search-channel.c')
| -rw-r--r-- | src/search-channel.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/src/search-channel.c b/src/search-channel.c index 623e0dd76..99556b74a 100644 --- a/src/search-channel.c +++ b/src/search-channel.c @@ -774,7 +774,7 @@ parse_extended_result_item (GabbleSearchChannel *chan, static gboolean parse_unextended_search_results (GabbleSearchChannel *chan, LmMessageNode *query_node, - GError *error) + GError **error) { TpHandleRepoIface *handles = tp_base_connection_get_handles ( (TpBaseConnection *) chan->base.conn, TP_HANDLE_TYPE_CONTACT); @@ -797,7 +797,7 @@ parse_unextended_search_results (GabbleSearchChannel *chan, static gboolean parse_extended_search_results (GabbleSearchChannel *chan, LmMessageNode *query_node, - GError *error) + GError **error) { TpHandleRepoIface *handles = tp_base_connection_get_handles ( (TpBaseConnection *) chan->base.conn, TP_HANDLE_TYPE_CONTACT); @@ -807,7 +807,7 @@ parse_extended_search_results (GabbleSearchChannel *chan, x = lm_message_node_get_child_with_namespace (query_node, "x", NS_X_DATA); if (x == NULL) { - error = g_error_new (TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "reply doens't contain a <x> node"); return FALSE; } @@ -834,7 +834,7 @@ parse_extended_search_results (GabbleSearchChannel *chan, static gboolean parse_search_results (GabbleSearchChannel *chan, LmMessageNode *query_node, - GError *error) + GError **error) { if (chan->priv->xforms) return parse_extended_search_results (chan, query_node, error); @@ -903,27 +903,28 @@ search_reply_cb (GabbleConnection *conn, "%s is broken: its iq reply didn't contain a <query/>", chan->priv->server); } + else + { + parse_search_results (chan, query_node, &err); + } - if (err != NULL) - goto fail; - - if (!parse_search_results (chan, query_node, err)) - goto fail; - - /* fire SearchStateChanged */ - gabble_svc_channel_type_contact_search_emit_search_result_received (chan, - chan->priv->results); - - change_search_state (chan, GABBLE_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED, - NULL); - - return LM_HANDLER_RESULT_REMOVE_MESSAGE; + if (err == NULL) + { + /* fire SearchStateChanged */ + gabble_svc_channel_type_contact_search_emit_search_result_received (chan, + chan->priv->results); -fail: - DEBUG ("Searching failed: %s", err->message); + change_search_state (chan, GABBLE_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED, + NULL); + } + else + { + DEBUG ("Searching failed: %s", err->message); + change_search_state (chan, GABBLE_CHANNEL_CONTACT_SEARCH_STATE_FAILED, + err); + g_error_free (err); + } - change_search_state (chan, GABBLE_CHANNEL_CONTACT_SEARCH_STATE_FAILED, err); - g_error_free (err); return LM_HANDLER_RESULT_REMOVE_MESSAGE; } |