diff options
| author | VMiklos <vmiklos@frugalware.org> | 2007-09-24 20:31:55 +0200 |
|---|---|---|
| committer | VMiklos <vmiklos@frugalware.org> | 2007-09-24 20:31:55 +0200 |
| commit | 3d9a92b727f0d45a8d3339101e800dd574fdeaea (patch) | |
| tree | 24ae95674cd1ccd67b533460abd59141e52dd375 | |
| parent | 4c3a4c890d3f532aa3b8acb6dac48057a4fecc19 (diff) | |
| parent | 368861e615827f27fb4897dd378b7ac0ffaa2176 (diff) | |
Merge branch 'master' of vmiklos@git.frugalware.org:/home/ftp/pub/other/people/vmiklos/bitlbee-skype
| -rw-r--r-- | skype/skype.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/skype/skype.c b/skype/skype.c index 6aa7259d..dc470749 100644 --- a/skype/skype.c +++ b/skype/skype.c @@ -47,8 +47,12 @@ struct skype_data { struct im_connection *ic; char *username; + /* The effective file descriptor. We store it here so any function can + * write() to it. */ int fd; - int r_inpa; + /* File descriptor returned by bitlbee. we store it so we know when + * we're connected and when we aren't. */ + int bfd; /* When we receive a new message id, we query the handle, then the * body. Store the handle here so that we imcb_buddy_msg() when we got * the body. */ @@ -345,8 +349,8 @@ gboolean skype_start_stream( struct im_connection *ic ) if(!sd) return FALSE; - if( sd->r_inpa <= 0 ) - sd->r_inpa = b_input_add( sd->fd, GAIM_INPUT_READ, skype_read_callback, ic ); + if( sd->bfd <= 0 ) + sd->bfd = b_input_add( sd->fd, GAIM_INPUT_READ, skype_read_callback, ic ); /* This will download all buddies. */ buf = g_strdup_printf("SEARCH FRIENDS\n"); |