Changeset 3d9a92b


Ignore:
Timestamp:
2007-09-24T18:31:55Z (13 years ago)
Author:
VMiklos <vmiklos@…>
Branches:
master
Children:
25d87e4
Parents:
4c3a4c8 (diff), 368861e (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 'master' of vmiklos@…:/home/ftp/pub/other/people/vmiklos/bitlbee-skype

File:
1 edited

Legend:

Unmodified
Added
Removed
  • skype/skype.c

    r4c3a4c8 r3d9a92b  
    4848        struct im_connection *ic;
    4949        char *username;
     50        /* The effective file descriptor. We store it here so any function can
     51         * write() to it. */
    5052        int fd;
    51         int r_inpa;
     53        /* File descriptor returned by bitlbee. we store it so we know when
     54         * we're connected and when we aren't. */
     55        int bfd;
    5256        /* When we receive a new message id, we query the handle, then the
    5357         * body. Store the handle here so that we imcb_buddy_msg() when we got
     
    346350                return FALSE;
    347351
    348         if( sd->r_inpa <= 0 )
    349                 sd->r_inpa = b_input_add( sd->fd, GAIM_INPUT_READ, skype_read_callback, ic );
     352        if( sd->bfd <= 0 )
     353                sd->bfd = b_input_add( sd->fd, GAIM_INPUT_READ, skype_read_callback, ic );
    350354
    351355        /* This will download all buddies. */
Note: See TracChangeset for help on using the changeset viewer.