[cl-irc-cvs] r236 - trunk

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Sun Jan 13 10:43:28 2013
New Revision: 236

Log:
Patch by Julien Danjou: Remove the (unused) `socket' slot from connections.

Modified:
   trunk/command.lisp
   trunk/protocol.lisp

Modified: trunk/command.lisp
==============================================================================
--- trunk/command.lisp	Sun Jan 13 10:37:00 2013	(r235)
+++ trunk/command.lisp	Sun Jan 13 10:43:28 2013	(r236)
@@ -293,7 +293,6 @@
                                        (usocket:socket-stream socket))
                    (usocket:socket-stream socket)))
          (connection (make-connection :connection-type connection-type
-                                      :socket socket
                                       :network-stream stream
                                       :client-stream logging-stream
                                       :server-name server)))
@@ -552,7 +551,6 @@
             (make-dcc-chat-connection
              :irc-connection irc-connection
              :remote-user (find-user irc-connection (source message))
-             :socket socket
              :network-stream (usocket:socket-stream socket))))))))
 
 (defmethod dcc-request-accept ((message dcc-ctcp-dcc-chat-request-message))

Modified: trunk/protocol.lisp
==============================================================================
--- trunk/protocol.lisp	Sun Jan 13 10:37:00 2013	(r235)
+++ trunk/protocol.lisp	Sun Jan 13 10:43:28 2013	(r236)
@@ -122,10 +122,6 @@
     :initarg :server-port
     :accessor server-port
     :initform *default-irc-server-port*)
-   (socket
-    :initarg :socket
-    :reader socket
-    :documentation "Slot to store socket (for internal use only).")
    (network-stream
     :initarg :network-stream
     :accessor network-stream
@@ -212,7 +208,6 @@
                              (password nil)
                              (server-name "")
                              (server-port nil)
-                             (socket nil)
                              (network-stream nil)
                              (outgoing-external-format *default-outgoing-external-format*)
                              (client-stream t)
@@ -226,7 +221,6 @@
                                    :password password
                                    :server-name server-name
                                    :server-port server-port
-                                   :socket socket
                                    :network-stream network-stream
                                    :output-stream output-stream
                                    :client-stream client-stream)))
@@ -461,11 +455,6 @@
     :accessor remote-user
     :documentation "The user at the other end of this connection.  The
 user at this end can be reached via your normal connection object.")
-   (socket
-    :initarg :socket
-    :accessor socket
-    :initform nil
-    :documentation "Socket used to do the remote client.")
    (network-stream
     :initarg :network-stream
     :accessor network-stream)
@@ -554,7 +543,6 @@
                                       (client-stream nil)
                                       (irc-connection nil)
                                       (close-on-main t)
-                                      (socket nil)
                                       (network-stream nil)
                                       (outgoing-external-format *default-outgoing-external-format*)
                                       (hooks nil))
@@ -569,7 +557,6 @@
                                     :output-stream output-stream
                                     :irc-connection irc-connection
                                     :close-on-main close-on-main
-                                    :socket socket
                                     :network-stream network-stream)))
     (dolist (hook hooks)
       (add-hook connection (car hook) (cdar hook)))