Changeset 3d9a92b

Timestamp:

2007-09-24T18:31:55Z (17 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:

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

skype/skype.c

@@ -48 +48 @@
         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
@@ -346 +350 @@
                 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. */