[Telepathy-commits] [telepathy-salut/master] caps_req_stanza_callback: assert than node is not NULL as the filter already checked it was not

[Guillaume Desmottes]

---
 src/salut-disco.c |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/salut-disco.c b/src/salut-disco.c
index 2d61575..79bee18 100644
--- a/src/salut-disco.c
+++ b/src/salut-disco.c
@@ -448,24 +448,17 @@ caps_req_stanza_callback (SalutXmppConnectionManager *mgr,
 
   iq = stanza->node;
   query = gibber_xmpp_node_get_child_ns (iq, "query", NS_DISCO_INFO);
+  g_assert (query != NULL);
 
-  if (query != NULL)
+  node = gibber_xmpp_node_get_attribute (query, "node");
+  if (node != NULL)
     {
-      node = gibber_xmpp_node_get_attribute (query, "node");
-      if (node != NULL)
-        {
-          if (!g_str_has_prefix (node, GIBBER_TELEPATHY_NS_CAPS "#"))
-            suffix = "";
-          else if (strlen (node) < strlen (GIBBER_TELEPATHY_NS_CAPS) + 2)
-            suffix = "";
-          else
-            suffix = node + strlen (GIBBER_TELEPATHY_NS_CAPS) + 1;
-        }
+      if (!g_str_has_prefix (node, GIBBER_TELEPATHY_NS_CAPS "#"))
+        suffix = "";
+      else if (strlen (node) < strlen (GIBBER_TELEPATHY_NS_CAPS) + 2)
+        suffix = "";
       else
-        {
-          node = "";
-          suffix = "";
-        }
+        suffix = node + strlen (GIBBER_TELEPATHY_NS_CAPS) + 1;
     }
   else
     {
-- 
1.5.6.5