Changeset b8c336b for protocols/jabber/hipchat.c

Timestamp:

2015-05-09T19:50:30Z (9 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

File:

• protocols/jabber/hipchat.c (modified) (2 diffs)

protocols/jabber/hipchat.c

@@ -47 +47 @@
         jd->flags &= ~JFLAG_STREAM_RESTART;
 
-        if (!jabber_get_roster(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_iq_disco_server(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_get_hipchat_profile(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_iq_disco_muc(ic, muc_host)) {
+        if (!jabber_get_roster(ic) ||
+            !jabber_iq_disco_server(ic) ||
+            !jabber_get_hipchat_profile(ic) ||
+            !jabber_iq_disco_muc(ic, muc_host)) {
                 return XT_ABORT;
         }
@@ -84 +78 @@
 {
         struct xt_node *query, *name_node;
-
-        //char *name;
 
         if (!(query = xt_find_node(node->children, "query"))) {