[telepathy-gabble/master] 'x' node should contain a type attribute when sending search request

[Guillaume Desmottes]

---
 src/search-channel.c             |    5 ++++-
 tests/twisted/search/extended.py |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/search-channel.c b/src/search-channel.c
index 878d18d..892a0b6 100644
--- a/src/search-channel.c
+++ b/src/search-channel.c
@@ -930,7 +930,10 @@ build_extended_query (LmMessageNode *query,
   gpointer key, value;
 
   x = lm_message_node_add_child (query, "x", "");
-  lm_message_node_set_attribute (x, "xmlns", NS_X_DATA);
+  lm_message_node_set_attributes (x,
+      "type", "submit",
+      "xmlns", NS_X_DATA,
+      NULL);
 
   /* add FORM_TYPE */
   field = lm_message_node_add_child (x, "field", "");
diff --git a/tests/twisted/search/extended.py b/tests/twisted/search/extended.py
index 03e595e..d84769e 100644
--- a/tests/twisted/search/extended.py
+++ b/tests/twisted/search/extended.py
@@ -62,7 +62,7 @@ def do_one_search(q, bus, conn, requests, stream, fields, expected_search_keys,
     iq = make_search(q, c_search, c_props, server, terms)
     query = iq.firstChildElement()
     fields = xpath.queryForNodes(
-        '/iq/query[@xmlns="%s"]/x[@xmlns="%s"]/field'
+        '/iq/query[@xmlns="%s"]/x[@xmlns="%s"][@type="submit"]/field'
         % (ns.SEARCH, ns.X_DATA), iq)
     assert fields is not None
 
-- 
1.5.6.5