2006-04-13 Steve Youngs <steve@sxemacs.org>

	* riece-commands.el (riece-command-invite): Add missing `:' to
	string sent to server.

	* riece-300.el (riece-handle-341-message): swap values for
	`channel' and `user'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de71f8e..4929708 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-13  Steve Youngs  <steve@sxemacs.org>
+
+       * riece-commands.el (riece-command-invite): Add missing `:' to
+       string sent to server.
+
+       * riece-300.el (riece-handle-341-message): swap values for
+       `channel' and `user'.
+
 2006-04-03  Daiki Ueno  <ueno@unixuser.org>
 
        * riece.el (riece-buffer-alist): " *Debug*" -> "*Debug*".

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index f77e73d..0e8631f 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -338,8 +338,8 @@
 
 (defun riece-handle-341-message (prefix number name string)
   (if (string-match "^\\([^ ]+\\) " string)
-      (let* ((channel (match-string 1 string))
-            (user (substring string (match-end 0)))
+      (let* ((channel (substring string (match-end 0)))
+            (user (match-string 1 string))
             (channel-identity (riece-make-identity channel riece-server-name))
             (buffer (riece-channel-buffer channel-identity)))
        (riece-insert-info buffer (concat "Inviting " user "\n"))

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index c6ed3d9..f924e51 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -205,7 +205,7 @@ the layout to the selected layout-name."
            "Invite user: "
            (riece-get-users-on-server (riece-current-server-name))
            nil nil nil nil nil t))))
-  (riece-send-string (format "INVITE %s %s\r\n"
+  (riece-send-string (format "INVITE %s :%s\r\n"
                             (riece-identity-prefix user)
                             (riece-identity-prefix riece-current-channel))))