Fixed muc presence check, remove logging from presence handler

2014-09-21 01:04:53 +01:00
parent 06856ecea1
commit c2e173479f
2 changed files with 11 additions and 22 deletions
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -765,21 +765,13 @@ stanza_is_muc_presence(xmpp_stanza_t * const stanza)
        return FALSE;
    }

-    xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X);
+    xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER);

-    if (x == NULL) {
+    if (x) {
+        return TRUE;
+    } else {
        return FALSE;
    }
-
-    char *ns = xmpp_stanza_get_ns(x);
-    if (ns == NULL) {
-        return FALSE;
-    }
-    if (strcmp(ns, STANZA_NS_MUC_USER) != 0) {
-        return FALSE;
-    }
-
-    return TRUE;
 }

 gboolean