Ignore:
Timestamp:
2012-04-12T21:37:12Z (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/skype.c

    r632f3d4 r6d23c68  
    11441144                g_strfreev(lines);
    11451145        } else if (st == 0 || (st < 0 && !sockerr_again())) {
    1146                 closesocket(sd->fd);
     1146                ssl_disconnect(sd->ssl);
    11471147                sd->fd = -1;
     1148                sd->ssl = NULL;
    11481149
    11491150                imcb_error(ic, "Error while reading from server");
     
    12341235                skype_group_free(sg, FALSE);
    12351236        }
     1237
     1238        if (sd->ssl)
     1239                ssl_disconnect(sd->ssl);
     1240
    12361241        g_free(sd->username);
    12371242        g_free(sd->handle);
Note: See TracChangeset for help on using the changeset viewer.