[telepathy-gabble/master] Move to state Failed if searching fails

Will Thompson will.thompson at collabora.co.uk
Wed Aug 26 09:21:53 PDT 2009


---
 src/search-channel.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/search-channel.c b/src/search-channel.c
index c79df40..5f44e11 100644
--- a/src/search-channel.c
+++ b/src/search-channel.c
@@ -571,15 +571,19 @@ search_reply_cb (GabbleConnection *conn,
 
       g_assert (chan->priv->failure_reason == NULL);
       chan->priv->failure_reason = err;
+
+      g_object_set (chan,
+          "search-state", GABBLE_CHANNEL_CONTACT_SEARCH_STATE_FAILED,
+          NULL);
     }
   else
     {
       parse_search_results (chan, query_node);
-    }
 
-  g_object_set (chan,
-      "search-state", GABBLE_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED,
-      NULL);
+      g_object_set (chan,
+          "search-state", GABBLE_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED,
+          NULL);
+    }
 
   return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 }
-- 
1.5.6.5




More information about the telepathy-commits mailing list