Changeset 3edaed9 for protocols/ssl_nss.c

Timestamp:

2006-04-25T17:57:23Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1be54a9

Parents:

85616c3 (diff), 79c6f9f (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:

Misc. things (mainly code cleanup, better quoting for root commands)

File:

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

protocols/ssl_nss.c

@@ -122 +122 @@
         if( source == -1 )
                 goto ssl_connected_failure;
-
         
-
-
+        /* Until we find out how to handle non-blocking I/O with NSS... */
+        sock_make_blocking( conn->fd );
+        
         conn->prfd = SSL_ImportFD(NULL, PR_ImportTCPSocket(source));
         SSL_OptionSet(conn->prfd, SSL_SECURITY, PR_TRUE);
@@ -181 +181 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        /* Just in case someone calls us, let's return the most likely case: */
+        return GAIM_INPUT_READ;
+}