[beirc-cvs] CVS beirc

[rgoldman]

Update of /project/beirc/cvsroot/beirc
In directory clnet:/tmp/cvs-serv23116

Modified Files:
	application.lisp 
Log Message:
Fixed bad default value for port in com-command.  Possibly this was a
problem created by a change in cl-irc's API?  At any rate the
structure it was using was a plist instead of a number.

Also made it possible to start beirc *without* reading the user's init
file, using a keyword argument to the beirc function.


--- /project/beirc/cvsroot/beirc/application.lisp	2007/02/25 12:29:58	1.88
+++ /project/beirc/cvsroot/beirc/application.lisp	2007/06/27 23:16:00	1.89
@@ -301,7 +301,7 @@
 
 ;;;
 
-(defun beirc (&key (new-process (processes-supported-p)))
+(defun beirc (&key (new-process (processes-supported-p)) (load-init-file t))
   (let* ((syms '(*package* *trace-output*))
          (vals (mapcar #'symbol-value syms))
          (program (lambda ()
@@ -311,7 +311,8 @@
                                                (clim-sys:make-process (lambda () (ticker frame))
                                                                       :name "Beirc Ticker"))))
                         (setf *beirc-frame* frame)
-                        (load-user-init-file)
+			(when load-init-file
+			  (load-user-init-file))
                         (run-frame-top-level frame)
                         (when (processes-supported-p)
                           (clim-sys:destroy-process ticker-process))
@@ -898,7 +899,16 @@
        :tester ((object)
                 (channel object)))
     (object)
-  (channel object))
+    (channel object))
+
+;;;(define-presentation-to-command-translator close-via-tab-button
+;;;    (tab-pane com-close beirc
+;;;	      :menu t
+;;;	      :gesture nil
+;;;	      :documentation "Close this channel"
+;;;	      :pointer-documentation "Close this channel")
+;;;    (object)
+;;;  (list (channel object)))
 
 (define-presentation-translator nickname-to-hostmask-translator
     (nickname hostmask beirc
@@ -928,13 +938,13 @@
      (nick 'string :prompt "Nick name" :default *default-nick*)
      (realname 'string :prompt "Real name (phrase)" :default *default-realname*)
      (pass 'string :prompt "Password" :default nil)
-     (port 'number :prompt "Port" :default irc::*default-irc-server-port*))
+     (port 'number :prompt "Port" :default nil))
   (let ((success nil)
         (maybe-server-receiver (server-receiver-from-args *application-frame* server port nick)))
     (or (and maybe-server-receiver (connection-open-p maybe-server-receiver))
         (let* ((frame *application-frame*)
                (connection (apply #'irc:connect
-                                  :nickname nick :server server :connection-type 'beirc-connection :port port
+                                  :nickname nick :server server :connection-type 'beirc-connection :port (or port :default)
 				  ;; this works because the default in
 				  ;; cl-irc is NIL, so we don't have
 				  ;; to handle this specially as with