Changeset 6d23c68 for protocols

Timestamp:

2012-04-12T21:37:12Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e93fa05

Parents:

632f3d4 (diff), 58b65b33 (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:

Merging ssl_disconnect() fix from meh/vmiklos.

File:

• protocols/skype/skype.c (modified) (2 diffs)

protocols/skype/skype.c

@@ -1144 +1144 @@
                 g_strfreev(lines);
         } else if (st == 0 || (st < 0 && !sockerr_again())) {
-                closesocket(sd->fd);
+                ssl_disconnect(sd->ssl);
                 sd->fd = -1;
+                sd->ssl = NULL;
 
                 imcb_error(ic, "Error while reading from server");
@@ -1234 +1235 @@
                 skype_group_free(sg, FALSE);
         }
+
+        if (sd->ssl)
+                ssl_disconnect(sd->ssl);
+
         g_free(sd->username);
         g_free(sd->handle);