From: ueno <ueno>
Date: Sat, 25 Sep 2004 06:05:31 +0000 (+0000)
Subject: Simplified.
X-Git-Tag: riece-1_0_4~12
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c182db600486e2bc9fa1362961e7089206856102;p=elisp%2Friece.git

Simplified.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 682e28f..881c1b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,11 +4,10 @@
 	(riece-flush-send-queue): New function.
 	(riece-process-send-string): Use it.
 	(riece-reset-process-buffer): Reset riece-send-queue,
-	riece-last-send-time, riece-send-size.
+	riece-send-size.
 	* riece-options.el (riece-max-send-size): New user option.
 	(riece-send-delay): New user option.
 	* riece-globals.el (riece-send-queue): New variable.
-	(riece-last-send-time): New variable.
 	(riece-send-size): New variable.
 
 2004-09-14  OHASHI Akira  <bg66@koka-in.org>
diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index 711edc3..a910ea1 100644
--- a/lisp/riece-globals.el
+++ b/lisp/riece-globals.el
@@ -111,9 +111,6 @@ Local to the server buffers.")
 (defvar riece-send-queue nil
   "Send queue for avoiding client flood.
 Local to the server buffers.")
-(defvar riece-last-send-time nil
-  "Timestamp of the last send.
-Local to the server buffers.")
 (defvar riece-send-size nil
   "Size of the last send.
 Local to the server buffers.")
diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 2bfd51f..74bf56c 100644
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -118,9 +118,8 @@ the `riece-server-keyword-map' variable."
 	(if (> length riece-max-send-size)
 	    (message "Long message (%d > %d)" length riece-max-send-size)
 	  (setq riece-send-size (+ riece-send-size length))
-	  (when (<= riece-send-size riece-max-send-size)
-	    (process-send-string process string)
-	    (setq riece-last-send-time (current-time))))
+	  (if (<= riece-send-size riece-max-send-size)
+	      (process-send-string process string)))
 	(setq riece-send-queue (cdr riece-send-queue)))
       (if riece-send-queue
 	  (riece-run-at-time riece-send-delay nil
@@ -201,8 +200,6 @@ the `riece-server-keyword-map' variable."
     (make-local-variable 'riece-server-name)
     (make-local-variable 'riece-read-point)
     (make-local-variable 'riece-send-queue)
-    (make-local-variable 'riece-last-send-time)
-    (setq riece-last-send-time '(0 0 0))
     (make-local-variable 'riece-send-size)
     (setq riece-send-size 0)
     (setq riece-read-point (point-min))