Changeset b8c336b for protocols/msn/gw.c

Timestamp:

2015-05-09T19:50:30Z (10 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/msn/gw.c (modified) (2 diffs)

protocols/msn/gw.c

@@ -87 +87 @@
         gw->polling = FALSE;
 
+        if (req->status_code != 200 || !req->reply_body) {
+                gw->callback(gw->md, -1, B_EV_IO_READ);
+                return;
+        }
+
         if (getenv("BITLBEE_DEBUG")) {
                 fprintf(stderr, "\n\x1b[90mHTTP:%s\n", req->reply_body);
                 fprintf(stderr, "\n\x1b[97m\n");
-        }
-
-        if (req->status_code != 200) {
-                gw->callback(gw->md, -1, B_EV_IO_READ);
-                return;
         }
 
@@ -113 +113 @@
         if (req->body_size) {
                 g_byte_array_append(gw->in, (const guint8 *) req->reply_body, req->body_size);
-                gw->callback(gw->md, -1, B_EV_IO_READ);
+
+                if (!gw->callback(gw->md, -1, B_EV_IO_READ)) {
+                        return;
+                }
         }