Changeset b8c336b for protocols/msn/ns.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/ns.c (modified) (2 diffs)

protocols/msn/ns.c

@@ -181 +181 @@
                 imcb_error(ic, "Error while reading from server");
                 imc_logout(ic, TRUE);
+                g_free(bytes);
                 return FALSE;
         }
@@ -188 +189 @@
         g_free(bytes);
 
-        /* Ignore ret == 0, it's already disconnected then. */
-        msn_handler(md);
-
-        return TRUE;
-        
+        return msn_handler(md);
 }