emacs-jabber-commit — jabber.el commit messages

emacs-jabber jabber-roster.el,1.47,1.48

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv22393

Modified Files:
	jabber-roster.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-365
Creator:  Magnus Henoch <ma...@fr...>

defalias of emacs 21 doesn't accept a docstring


Index: jabber-roster.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-roster.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- jabber-roster.el	8 May 2007 15:57:48 -0000	1.47
+++ jabber-roster.el	3 Jun 2007 18:33:22 -0000	1.48
@@ -1,7 +1,7 @@
 ;; jabber-roster.el - displaying the roster    -*- coding: utf-8; -*-
 
-;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
 ;; Copyright (C) 2003, 2004, 2007 - Magnus Henoch - ma...@fr...
+;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
 
 ;; This file is a part of jabber.el.
 
@@ -496,9 +496,9 @@
 	   (t
 	    (setq where (ewoc-next ewoc where)))))))))
 
-(defalias 'jabber-presence-update-roster 'ignore
-  "jabber-presence-update-roster is not needed anymore.
-Its work is done in `jabber-process-presence'.")
+(defalias 'jabber-presence-update-roster 'ignore)
+;;jabber-presence-update-roster is not needed anymore.
+;;Its work is done in `jabber-process-presence'."
 (make-obsolete 'jabber-presence-update-roster 'ignore)
 
 (defun jabber-go-to-next-jid ()

emacs-jabber jabber-ft-server.el,1.13,1.14

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv22380

Modified Files:
	jabber-ft-server.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-364
Creator:  Magnus Henoch <ma...@fr...>

Check MD5 hash of received files


Index: jabber-ft-server.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-ft-server.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jabber-ft-server.el	7 Feb 2007 13:49:38 -0000	1.13
+++ jabber-ft-server.el	3 Jun 2007 18:33:11 -0000	1.14
@@ -1,7 +1,7 @@
 ;; jabber-ft-server.el - handle incoming file transfers, by JEP-0096
 
+;; Copyright (C) 2003, 2004, 2007 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
-;; Copyright (C) 2003, 2004 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -28,6 +28,9 @@
 (defvar jabber-ft-size nil
   "Size of the file that is being downloaded")
 
+(defvar jabber-ft-md5-hash nil
+  "MD5 hash of the file that is being downloaded")
+
 (add-to-list 'jabber-advertised-features "http://jabber.org/protocol/si/profile/file-transfer")
 
 (add-to-list 'jabber-si-profiles
@@ -78,8 +81,10 @@
 	(if (fboundp 'set-buffer-multibyte)
 	    (set-buffer-multibyte nil))
 	(set-visited-file-name file-name t)
-	(make-local-variable 'jabber-ft-size)
-	(setq jabber-ft-size (string-to-number size)))
+	(set (make-local-variable 'jabber-ft-size) 
+	     (string-to-number size))
+	(set (make-local-variable 'jabber-ft-md5-hash)
+	     md5-hash))
       (add-to-list 'jabber-ft-sessions
 		   (cons (list si-id from) buffer)))
       
@@ -107,7 +112,17 @@
       (if (and data (< (buffer-size) jabber-ft-size))
 	  t
 	(basic-save-buffer)
-	(message "%s downloaded" (file-name-nondirectory buffer-file-name))
+	(if (and jabber-ft-md5-hash
+		 (let ((file-hash (jabber-ft-get-md5 buffer-file-name)))
+		   (and file-hash
+			(not (string= file-hash jabber-ft-md5-hash)))))
+	    ;; hash mismatch!
+	    (progn
+	      (message "%s downloaded - CHECKSUM MISMATCH!"
+		       (file-name-nondirectory buffer-file-name))
+	      (sleep-for 5))
+	  ;; all is fine
+	  (message "%s downloaded" (file-name-nondirectory buffer-file-name)))
 	(kill-buffer buffer)
 	nil))))
 

emacs-jabber jabber-truncate.el,1.1,1.2

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv3241

Modified Files:
	jabber-truncate.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-363
Creator:  Magnus Henoch <ma...@fr...>

s/jabber-clean/jabber-truncate/ in comments

Caught by Detlev Zundel.


Index: jabber-truncate.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-truncate.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jabber-truncate.el	7 May 2007 01:40:29 -0000	1.1
+++ jabber-truncate.el	15 May 2007 14:34:57 -0000	1.2
@@ -1,4 +1,4 @@
-;; jabber-clean.el - cleanup top lines in chatbuffers
+;; jabber-truncate.el - cleanup top lines in chatbuffers
 
 ;; Copyright (C) 2007 - Kirill A. Korinskiy - ca...@ca...
 

emacs-jabber jabber-wmii.el,1.1,1.2

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv3227

Modified Files:
	jabber-wmii.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-362
Creator:  Magnus Henoch <ma...@fr...>

jabber-wmii is actually a part of jabber.el; fix comment

Caught by Detlev Zundel.


Index: jabber-wmii.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-wmii.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jabber-wmii.el	7 May 2007 02:05:12 -0000	1.1
+++ jabber-wmii.el	15 May 2007 14:34:48 -0000	1.2
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2007 - Detlev Zundel - dz...@gn...
 
-;; This file is NOT a part of jabber.el.
+;; This file is a part of jabber.el.
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

emacs-jabber jabber-roster.el,1.46,1.47

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv18965

Modified Files:
	jabber-roster.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-361
Creator:  Magnus Henoch <ma...@fr...>

Add jabber-account property to resources in roster


Index: jabber-roster.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-roster.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- jabber-roster.el	7 May 2007 02:04:43 -0000	1.46
+++ jabber-roster.el	8 May 2007 15:57:48 -0000	1.47
@@ -445,7 +445,9 @@
 				  (or (cdr (assoc (plist-get (cdr resource) 'show) jabber-presence-faces))
 				      'jabber-roster-user-online)
 				  'jabber-jid
-				  (format "%s/%s" (symbol-name buddy) (car resource)))
+				  (format "%s/%s" (symbol-name buddy) (car resource))
+				  'jabber-account
+				  jc)
 				 resource-str)
 	    (insert "\n" resource-str)))))))
 

emacs-jabber jabber-vcard.el,1.14,1.15

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16933

Modified Files:
	jabber-vcard.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-360
Creator:  Magnus Henoch <ma...@fr...>

Fix bug in vcard publishing


Index: jabber-vcard.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-vcard.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jabber-vcard.el	20 Mar 2007 16:13:06 -0000	1.14
+++ jabber-vcard.el	8 May 2007 15:52:36 -0000	1.15
@@ -543,6 +543,7 @@
 		    #'jabber-report-success "Changing vCard")
     (when (bound-and-true-p jabber-vcard-avatars-publish)
       (jabber-vcard-avatars-update-current
+       jabber-buffer-connection
        (and jabber-vcard-photo (avatar-sha1-sum jabber-vcard-photo))))))
 
 (provide 'jabber-vcard)

emacs-jabber jabber-util.el,2.46,2.47

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32081

Modified Files:
	jabber-util.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-359
Creator:  Magnus Henoch <ma...@fr...>

Fix jabber-replace-in-string in presence of color-theme


Index: jabber-util.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-util.el,v
retrieving revision 2.46
retrieving revision 2.47
diff -u -d -r2.46 -r2.47
--- jabber-util.el	15 Apr 2007 23:53:00 -0000	2.46
+++ jabber-util.el	8 May 2007 12:22:42 -0000	2.47
@@ -24,13 +24,25 @@
 (defvar jabber-jid-history nil
   "History of entered JIDs")
 
+;; Define `jabber-replace-in-string' somehow.
 (cond
+ ;; Emacs 21 has replace-regexp-in-string.
+ ((fboundp 'replace-regexp-in-string)
+  (defsubst jabber-replace-in-string (str regexp newtext)
+    (replace-regexp-in-string regexp newtext str t t)))
+ ;; XEmacs has replace-in-string.  However, color-theme defines it as
+ ;; well on Emacs 2x, so this check must be last.
  ((fboundp 'replace-in-string)
+  ;; And the version in color-theme takes only three arguments.  Check
+  ;; just to be sure.
+  (condition-case nil
+      (replace-in-string "foobar" "foo" "bar" t)
+    (wrong-number-of-arguments
+     (error "`replace-in-string' doesn't accept fourth argument")))
   (defsubst jabber-replace-in-string (str regexp newtext)
     (replace-in-string str regexp newtext t)))
- ((fboundp 'replace-regexp-in-string)
-  (defsubst jabber-replace-in-string (str regexp newtext)
-    (replace-regexp-in-string regexp newtext str t t))))
+ (t
+  (error "No implementation of `jabber-replace-in-string' available")))
 
 ;;; XEmacs compatibility.  Stolen from ibuffer.el
 (if (fboundp 'propertize)

emacs-jabber jabber-history.el,1.26,1.27

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32068

Modified Files:
	jabber-history.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-358
Creator:  Magnus Henoch <ma...@fr...>

Add jabber-history-move-to-per-user

Yes, my design decision in 2004 was probably wrong ☺


Index: jabber-history.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-history.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- jabber-history.el	5 Feb 2007 21:59:02 -0000	1.26
+++ jabber-history.el	8 May 2007 12:22:26 -0000	1.27
@@ -1,7 +1,7 @@
 ;; jabber-history.el - recording message history
 
+;; Copyright (C) 2004, 2007 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2004 - Mathias Dahl
-;; Copyright (C) 2004 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -241,6 +241,48 @@
    (concat "^" (regexp-quote (jabber-jid-user jid)) "\\(/.*\\)?$")
    (jabber-history-filename jid)))
 
+(defun jabber-history-move-to-per-user ()
+  "Migrate global history to per-user files."
+  (interactive)
+  (when (file-directory-p jabber-history-dir)
+    (error "Per-user history directory already exists"))
+  (make-directory jabber-history-dir)
+  (let ((jabber-use-global-history nil))
+    (with-temp-buffer
+      (let ((coding-system-for-read 'utf-8))
+	(insert-file-contents jabber-global-history-filename))
+      (let ((progress-reporter
+	     (when (fboundp 'make-progress-reporter)
+	       (make-progress-reporter "Migrating history..."
+				       (point-min) (point-max))))
+	    ;;(file-table (make-hash-table :test 'equal))
+	    ;; Keep track of blocks of entries pertaining to the same JID.
+	    current-jid jid-start)
+	(while (not (eobp))
+	  (let* ((start (point))
+		 (end (progn (forward-line) (point)))
+		 (line (buffer-substring start end))
+		 (parsed (car (read-from-string line)))
+		 (jid (if (string= (aref parsed 2) "me")
+			  (aref parsed 3)
+			(aref parsed 2))))
+	    ;; Whenever there is a change in JID...
+	    (when (not (equal jid current-jid))
+	      (when current-jid
+		;; ...save data for previous JID...
+		(let ((history-file (jabber-history-filename current-jid)))
+		  (write-region jid-start start history-file t 'quiet)))
+	      ;; ...and switch to new JID.
+	      (setq current-jid jid)
+	      (setq jid-start start))
+	    (when (fboundp 'progress-reporter-update)
+	      (progress-reporter-update progress-reporter (point)))))
+	;; Finally, save the last block, if any.
+	(when current-jid
+	  (let ((history-file (jabber-history-filename current-jid)))
+	    (write-region jid-start (point-max) history-file t 'quiet))))))
+  (message "Done.  Please change `jabber-use-global-history' now."))
+	
 (provide 'jabber-history)
 
 ;; arch-tag: 0AA0C235-3FC0-11D9-9FE7-000A95C2FCD0

emacs-jabber jabber-wmii.el,NONE,1.1 jabber-alert.el,1.31,1.32

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4610

Modified Files:
	jabber-alert.el 
Added Files:
	jabber-wmii.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-357
Creator:  Magnus Henoch <ma...@fr...>

Add alert messages for wmii

Patch from Detlev Zundel.


--- NEW FILE: jabber-wmii.el ---
;; jabber-wmii.el - emacs-jabber interface to wmii

;; Copyright (C) 2007 - Detlev Zundel - dz...@gn...

;; This file is NOT a part of jabber.el.

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

(defvar jabber-wmii-color "#ffffff #335577 #447799"
  "Color specification as needed by the wmii window manager for the jabber alert messages.")

(defvar jabber-wmii-reset-time "20 sec"
  "If non-nil time to reset wmii message.  If nil the message has to be cleared by other means, i.e. from wmiirc.")

(defvar jabber-wmii-timer nil
  "Timer to clear wmii message.")

(defun jabber-wmii-clear ()
  "Clear any previous message output through wmii window manager."
  (condition-case e
      (call-process "wmiir" nil nil nil "remove" "/rbar/jabber")
    (error nil)))
  
(defun jabber-wmii-message (msg)
  "Show MSG in wmii."
  (when jabber-wmii-timer
    (cancel-timer jabber-wmii-timer))
  (let ((tmp (make-temp-file temporary-file-directory)))
    (with-temp-file tmp
      (insert  jabber-wmii-color " " msg))
    ;; Possible errors include not finding the wmiir binary, and
    ;; too many pipes open because of message flood.
    (condition-case e
	(call-process "wmiir" tmp nil nil "create" "/rbar/jabber")
      (error nil))
    (delete-file tmp))
  (when jabber-wmii-reset-time
    (setq jabber-wmii-timer
	  (run-at-time jabber-wmii-reset-time nil 'jabber-wmii-clear))))

(define-jabber-alert wmii "Show a message through the wmii window manager."
  'jabber-wmii-message)

(provide 'jabber-wmii)

Index: jabber-alert.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-alert.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- jabber-alert.el	14 Mar 2007 10:55:36 -0000	1.31
+++ jabber-alert.el	7 May 2007 02:05:12 -0000	1.32
@@ -1,7 +1,7 @@
 ;; jabber-alert.el - alert hooks
 
+;; Copyright (C) 2003, 2004, 2005, 2007 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
-;; Copyright (C) 2003, 2004, 2005 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -281,6 +281,7 @@
 (require 'jabber-sawfish)
 (require 'jabber-festival)
 (require 'jabber-xmessage)
+(require 'jabber-wmii)
 
 ;; Message alert hooks
 (defun jabber-message-default-message (from buffer text)

emacs-jabber jabber-sawfish.el,1.1,1.2

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4243

Modified Files:
	jabber-sawfish.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-356
Creator:  Magnus Henoch <ma...@fr...>

Fix for jabber-sawfish

Patch from Detlev Zundel.


Index: jabber-sawfish.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-sawfish.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jabber-sawfish.el	31 Aug 2005 20:10:15 -0000	1.1
+++ jabber-sawfish.el	7 May 2007 02:04:55 -0000	1.2
@@ -29,9 +29,11 @@
   (let ((process-connection-type nil))
     (start-process-shell-command 
      "jabber-sawfish" nil "echo" 
-     (concat "'(progn (display-message \"" 
+     (concat "'(progn (require (quote timers)) (display-message \""
 	     message
-	     "\")(make-timer (lambda () (display-message nil)) 3))' | sawfish-client - &> /dev/null"))))
+	     "\")(make-timer (lambda () (display-message nil)) "
+	     (number-to-string jabber-sawfish-display-time)
+	     "))' | sawfish-client - &> /dev/null"))))
 
 (define-jabber-alert sawfish "Display a message through the Sawfish window manager"
   'jabber-sawfish-display-message)

emacs-jabber jabber-roster.el,1.45,1.46

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4229

Modified Files:
	jabber-roster.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-355
Creator:  Magnus Henoch <ma...@fr...>

Add key binding for toggling offline contacts in roster

Patch from Detlev Zundel.


Index: jabber-roster.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-roster.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- jabber-roster.el	15 Apr 2007 23:53:24 -0000	1.45
+++ jabber-roster.el	7 May 2007 02:04:43 -0000	1.46
@@ -196,6 +196,7 @@
     (define-key map "a" 'jabber-send-presence)
     (define-key map "g" 'jabber-display-roster)
     (define-key map "S" 'jabber-ft-send)
+    (define-key map "o" 'jabber-roster-toggle-offline-display)
     ;;(define-key map "D" 'jabber-disconnect)
     map))
 
@@ -284,6 +285,13 @@
 				     (get buddy 'connected)))
 		 buddies))
 
+(defun jabber-roster-toggle-offline-display ()
+  "Toggle display of offline contacts."
+  (interactive)
+  (setq jabber-show-offline-contacts
+	(not jabber-show-offline-contacts))
+  (jabber-display-roster))
+
 (defun jabber-display-roster ()
   "switch to the main jabber buffer and refresh the roster display to reflect the current information"
   (interactive)
@@ -305,7 +313,7 @@
 q        Bury buffer             i        Get disco items
 I        Get disco info          b        Browse
 j        Join groupchat (MUC)    v        Get client version
-a        Send presence
+a        Send presence           o        Show offline contacts on/off
 C-c C-c  Chat menu               C-c C-m  Multi-User Chat menu
 C-c C-i  Info menu               C-c C-r  Roster menu
 C-c C-s  Service menu

emacs-jabber jabber-truncate.el, NONE, 1.1 jabber.el, 1.73, 1.74 NEWS, 1.57, 1.58 jabber-clean.el, 1.1, NONE

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27500

Modified Files:
	jabber.el NEWS 
Added Files:
	jabber-truncate.el 
Removed Files:
	jabber-clean.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-354
Creator:  Magnus Henoch <ma...@fr...>

Rename clean to truncate; add option for chat buffers


--- jabber-clean.el DELETED ---

Index: NEWS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- NEWS	6 May 2007 14:53:11 -0000	1.57
+++ NEWS	7 May 2007 01:40:29 -0000	1.58
@@ -10,7 +10,7 @@
 (not documented yet)
 
 ** Clean history from chat buffers
-See jabber-clean-top and new option for jabber-alert-muc-hooks.
+See jabber-truncate-top and new option for jabber-alert-muc-hooks.
 (not documented yet)
 
 ** MUC bookmarks

--- NEW FILE: jabber-truncate.el ---
;; jabber-clean.el - cleanup top lines in chatbuffers

;; Copyright (C) 2007 - Kirill A. Korinskiy - ca...@ca...

;; This file is a part of jabber.el.

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

(require 'jabber-chat)
(eval-when-compile (require 'cl))

(defvar jabber-log-lines-to-keep 1000
  "Maximum number of lines in chat buffer")

(defun jabber-truncate-top ()
  "Clean old history from a chat buffer.
`jabber-log-lines-to-keep' specifies the number of lines to
keep."
  (interactive)
  (let ((inhibit-read-only t)
	(delete-before 
	 ;; go back one node, to make this function "idempotent"
	 (ewoc-prev
	  jabber-chat-ewoc
	  (ewoc-locate jabber-chat-ewoc
		       (save-excursion
			 (goto-char (point-max))
			 (forward-line (- jabber-log-lines-to-keep))
			 (point))))))
    (while delete-before 
      (setq delete-before
	    (prog1 
		(ewoc-prev jabber-chat-ewoc delete-before)
	      (ewoc-delete jabber-chat-ewoc delete-before))))))

(defun jabber-truncate-muc (nick group buffer text proposed-alert)
  "Clean old history from MUC buffers.
`jabber-log-lines-to-keep' specifies the number of lines to
keep."
  (jabber-truncate-top))

(defun jabber-truncate-chat (from buffer text proposed-alert)
  "Clean old history from chat buffers.
`jabber-log-lines-to-keep' specifies the number of lines to
keep.

Note that this might interfer with
`jabber-chat-display-more-backlog': you ask for more history, you
get it, and then it just gets deleted."
  (jabber-truncate-top))

(pushnew 'jabber-truncate-muc (get 'jabber-alert-muc-hooks 'custom-options))
(pushnew 'jabber-truncate-chat (get 'jabber-alert-message-hooks 'custom-options))

(provide 'jabber-truncate)

;; arch-tag: 3d1e3428-f598-11db-a314-000a95c2fcd0

Index: jabber.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- jabber.el	28 Apr 2007 15:00:36 -0000	1.73
+++ jabber.el	7 May 2007 01:40:29 -0000	1.74
@@ -104,7 +104,7 @@
 (require 'jabber-vcard-avatars)
 (require 'jabber-autoaway)
 (require 'jabber-time)
-(require 'jabber-clean)
+(require 'jabber-truncate)
 
 (require 'jabber-ft-client)
 (require 'jabber-ft-server)

emacs-jabber jabber-chat.el,1.77,1.78

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27230

Modified Files:
	jabber-chat.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-353
Creator:  Magnus Henoch <ma...@fr...>

Use jabber-chat-text-{local,foreign} for MUC text too


Index: jabber-chat.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-chat.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- jabber-chat.el	20 Mar 2007 16:13:20 -0000	1.77
+++ jabber-chat.el	7 May 2007 01:40:12 -0000	1.78
@@ -530,8 +530,8 @@
 	  (insert (jabber-propertize 
 		   body
 		   'face (case who
-			   (:foreign 'jabber-chat-text-foreign)
-			   (:local 'jabber-chat-text-local))))))
+			   ((:foreign :muc-foreign) 'jabber-chat-text-foreign)
+			   ((:local :muc-local) 'jabber-chat-text-local))))))
       t)))
 
 (defun jabber-chat-print-url (xml-data who mode)

emacs-jabber jabber-bookmarks.el, 1.6, 1.7 jabber-muc.el, 1.67, 1.68 NEWS, 1.56, 1.57

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3336

Modified Files:
	jabber-bookmarks.el jabber-muc.el NEWS 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-352
Creator:  Magnus Henoch <ma...@fr...>

Reactivate jabber-muc-autojoin variable

Based on patch from Kirill A. Korinskiy.


Index: NEWS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- NEWS	28 Apr 2007 15:00:36 -0000	1.56
+++ NEWS	6 May 2007 14:53:11 -0000	1.57
@@ -13,6 +13,9 @@
 See jabber-clean-top and new option for jabber-alert-muc-hooks.
 (not documented yet)
 
+** MUC bookmarks
+(not documented yet)
+
 * New features in jabber.el 0.7.1
 
 ** STARTTLS

Index: jabber-muc.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- jabber-muc.el	9 Apr 2007 16:37:40 -0000	1.67
+++ jabber-muc.el	6 May 2007 14:53:11 -0000	1.68
@@ -48,29 +48,20 @@
   "The topic of the current MUC room.")
 
 (defcustom jabber-muc-default-nicknames nil
-  "Obsolete variable.
-Call `jabber-edit-bookmarks' to migrate settings.
-Use `jabber-get-conference-data' in programs."
+  "Default nickname for specific MUC rooms."
   :group 'jabber-chat
   :type '(repeat
 	  (cons :format "%v"
 		(string :tag "JID of room")
 		(string :tag "Nickname"))))
-(make-obsolete-variable 
- 'jabber-muc-default-nicknames
- "Call `jabber-edit-bookmarks' to migrate settings.
-Use `jabber-get-conference-data' in programs.")
 
 (defcustom jabber-muc-autojoin nil
-  "Obsolete variable.
-Call `jabber-edit-bookmarks' to migrate settings.
-Use `jabber-get-conference-data' in programs."
+  "List of MUC rooms to automatically join on connection.
+This list is saved in your Emacs customizations.  You can also store
+such a list on the Jabber server, where it is available to every
+client; see `jabber-edit-bookmarks'."
   :group 'jabber-chat
   :type '(repeat (string :tag "JID of room")))
-(make-obsolete-variable 
- 'jabber-muc-autojoin
- "Call `jabber-edit-bookmarks' to migrate settings.
-Use `jabber-get-conference-data' in programs.")
 
 (defcustom jabber-muc-disable-disco-check nil
   "If non-nil, disable checking disco#info of rooms before joining them.
@@ -695,11 +686,13 @@
 	  (return t))))))
 
 (defun jabber-muc-autojoin (jc)
-  "Join rooms specified in account bookmarks."
+  "Join rooms specified in account bookmarks and global `jabber-muc-autojoin'."
   (interactive (list (jabber-read-account)))
-  (when (or (bound-and-true-p jabber-muc-autojoin)
-	    (bound-and-true-p jabber-muc-default-nicknames))
-    (warn "`jabber-muc-autojoin' and `jabber-muc-default-nicknames' will not be heeded."))
+  (when (bound-and-true-p jabber-muc-autojoin)
+    (dolist (group jabber-muc-autojoin)
+      (jabber-groupchat-join jc group (or
+				       (cdr (assoc group jabber-muc-default-nicknames))
+				       jabber-nickname))))
   (jabber-get-bookmarks
    jc
    (lambda (jc bookmarks)

Index: jabber-bookmarks.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-bookmarks.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jabber-bookmarks.el	20 Mar 2007 16:13:05 -0000	1.6
+++ jabber-bookmarks.el	6 May 2007 14:53:11 -0000	1.7
@@ -134,8 +134,9 @@
     (when (or (bound-and-true-p jabber-muc-autojoin)
 	      (bound-and-true-p jabber-muc-default-nicknames))
       (widget-insert "The variables `jabber-muc-autojoin' and/or `jabber-muc-default-nicknames'\n"
-		     "contain values, but they have no effect in this version of jabber.el.\n"
-		     "You may want to import them into your bookmarks.\n")
+		     "contain values.  They are only available to jabber.el on this machine.\n"
+		     "You may want to import them into your bookmarks, to make them available\n"
+		     "to any client on any machine.\n")
       (widget-create 'push-button :notify 'jabber-bookmarks-import "Import values from variables")
       (widget-insert "\n\n"))
 

emacs-jabber srv.el,2.1,2.2

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11676

Modified Files:
	srv.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-351
Creator:  Magnus Henoch <ma...@fr...>

Don't require dns.el to be available


Index: srv.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/srv.el,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- srv.el	23 Apr 2006 15:09:56 -0000	2.1
+++ srv.el	1 May 2007 16:37:16 -0000	2.2
@@ -1,6 +1,6 @@
 ;;; srv.el --- perform SRV DNS requests
 
-;; Copyright (C) 2005  Magnus Henoch
+;; Copyright (C) 2005, 2007  Magnus Henoch
 
 ;; Author: Magnus Henoch <ma...@fr...>
 ;; Keywords: comm
@@ -29,7 +29,9 @@
 
 ;;; Code:
 
-(require 'dns)
+(condition-case nil
+    (require 'dns)
+  (error nil))
 (eval-when-compile (require 'cl))
 
 (defun srv-lookup (target)
@@ -40,6 +42,8 @@
 a hostname and PORT is a numeric port.  The caller is supposed to
 make connection attempts in the order given, starting from the beginning
 of the list.  The list is empty if no SRV records were found."
+  (unless (boundp 'dns-query-types)
+    (error "No dns.el available"))
   (unless (assq 'SRV dns-query-types)
     (error "dns.el doesn't support SRV lookups"))
   (let* ((result (query-dns target 'SRV t))

emacs-jabber jabber-clean.el, NONE, 1.1 jabber.el, 1.72, 1.73 AUTHORS, 1.8, 1.9 NEWS, 1.55, 1.56

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4742

Modified Files:
	jabber.el AUTHORS NEWS 
Added Files:
	jabber-clean.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-350
Creator:  Magnus Henoch <ma...@fr...>

Add jabber-clean

>From Kirill A. Korinskiy


--- NEW FILE: jabber-clean.el ---
;; jabber-clean.el - cleanup top lines in chatbuffers

;; Copyright (C) 2007 - Kirill A. Korinskiy - ca...@ca...

;; This file is a part of jabber.el.

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

(require 'jabber-chat)
(eval-when-compile (require 'cl))

(defvar jabber-log-lines-to-keep 1000
  "Maximum number of lines in chat buffer")

(defun jabber-clean-top ()
  "Clean old history from a chat buffer.
`jabber-log-lines-to-keep' specifies the number of lines to
keep."
  (interactive)
  (let ((inhibit-read-only t)
	(delete-before 
	 ;; go back one node, to make this function "idempotent"
	 (ewoc-prev
	  jabber-chat-ewoc
	  (ewoc-locate jabber-chat-ewoc
		       (save-excursion
			 (goto-char (point-max))
			 (forward-line (- jabber-log-lines-to-keep))
			 (point))))))
    (while delete-before 
      (setq delete-before
	    (prog1 
		(ewoc-prev jabber-chat-ewoc delete-before)
	      (ewoc-delete jabber-chat-ewoc delete-before))))))

(defun jabber-clean-muc (nick group buffer text proposed-alert)
  "Clean old history from MUC buffers.
`jabber-log-lines-to-keep' specifies the number of lines to
keep."
  (jabber-clean-top))

(pushnew 'jabber-clean-muc (get 'jabber-alert-muc-hooks 'custom-options))

(provide 'jabber-clean)

;; arch-tag: 3d1e3428-f598-11db-a314-000a95c2fcd0

Index: NEWS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- NEWS	15 Apr 2007 23:53:24 -0000	1.55
+++ NEWS	28 Apr 2007 15:00:36 -0000	1.56
@@ -9,6 +9,10 @@
 See jabber-show-offline-contacts.
 (not documented yet)
 
+** Clean history from chat buffers
+See jabber-clean-top and new option for jabber-alert-muc-hooks.
+(not documented yet)
+
 * New features in jabber.el 0.7.1
 
 ** STARTTLS

Index: jabber.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- jabber.el	12 Feb 2007 20:50:22 -0000	1.72
+++ jabber.el	28 Apr 2007 15:00:36 -0000	1.73
@@ -1,7 +1,7 @@
 ;; jabber.el - a minimal jabber client
 
+;; Copyright (C) 2003, 2004, 2007 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
-;; Copyright (C) 2003, 2004 - Magnus Henoch - ma...@fr...
 
 ;; SSL - Support, mostly inspired by Gnus
 ;; Copyright (C) 2005 - Georg Lehner - jo...@ma...
@@ -104,6 +104,7 @@
 (require 'jabber-vcard-avatars)
 (require 'jabber-autoaway)
 (require 'jabber-time)
+(require 'jabber-clean)
 
 (require 'jabber-ft-client)
 (require 'jabber-ft-server)

Index: AUTHORS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/AUTHORS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- AUTHORS	20 Mar 2007 11:49:32 -0000	1.8
+++ AUTHORS	28 Apr 2007 15:00:36 -0000	1.9
@@ -9,6 +9,7 @@
 François Fleuret
 David Hansen
 Justin Kirby
+Kirill A. Korinskiy
 Carl Henrik Lunde
 Andrey Slusar
 Evgenii Terechkov

emacs-jabber jabber-socks5.el,1.15,1.16

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26316

Modified Files:
	jabber-socks5.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-349
Creator:  Magnus Henoch <ma...@fr...>

Remove timeout from state `initiate' in jabber-socks5


Index: jabber-socks5.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-socks5.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- jabber-socks5.el	8 Feb 2007 15:08:01 -0000	1.15
+++ jabber-socks5.el	28 Apr 2007 14:34:57 -0000	1.16
@@ -1,7 +1,7 @@
 ;; jabber-socks5.el - SOCKS5 bytestreams by JEP-0065
 
+;; Copyright (C) 2003, 2004, 2007 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
-;; Copyright (C) 2003, 2004 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -268,7 +268,7 @@
      #'jabber-report-success "SOCKS5 negotiation"))
 
   ;; If we're the target, we just wait for an incoming stanza.
-  (list state-data 30))
+  (list state-data nil))
 
 (add-to-list 'jabber-iq-set-xmlns-alist
 	     (cons "http://jabber.org/protocol/bytestreams" 'jabber-socks5-process))

emacs-jabber jabber-core.el,1.50,1.51 jabber-sasl.el,2.8,2.9

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8373

Modified Files:
	jabber-core.el jabber-sasl.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-348
Creator:  Magnus Henoch <ma...@fr...>

Don't use compilation failure to detect non-support for SASL


Index: jabber-sasl.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-sasl.el,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** jabber-sasl.el	9 Apr 2007 16:37:33 -0000	2.8
--- jabber-sasl.el	22 Apr 2007 10:26:42 -0000	2.9
***************
*** 21,27 ****
  (require 'cl)
  
! ;;; This file uses sasl.el from FLIM, and expects to find it.  If it
! ;;; can't be found, jabber-core.el catches the error.
! (require 'sasl)
  
  ;;; Alternatives to FLIM would be the command line utility of GNU SASL,
--- 21,30 ----
  (require 'cl)
  
! ;;; This file uses sasl.el from FLIM or Gnus.  If it can't be found,
! ;;; jabber-core.el won't use the SASL functions.
! (eval-and-compile
!   (condition-case nil
!       (require 'sasl)
!     (error nil)))
  
  ;;; Alternatives to FLIM would be the command line utility of GNU SASL,

Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** jabber-core.el	20 Mar 2007 16:13:41 -0000	1.50
--- jabber-core.el	22 Apr 2007 10:26:42 -0000	1.51
***************
*** 30,38 ****
  (require 'fsm)
  
! ;; SASL depends on FLIM.
! (eval-and-compile
!   (condition-case nil
!       (require 'jabber-sasl)
!     (error nil)))
  
  (defvar jabber-connections nil
--- 30,34 ----
  (require 'fsm)
  
! (require 'jabber-sasl)
  
  (defvar jabber-connections nil
***************
*** 120,124 ****
  (defsubst jabber-have-sasl-p ()
    "Return non-nil if SASL functions are available."
!   (fboundp 'jabber-sasl-start-auth))
  
  (defun jabber-connect (username server resource &optional registerp)
--- 116,120 ----
  (defsubst jabber-have-sasl-p ()
    "Return non-nil if SASL functions are available."
!   (featurep 'sasl))
  
  (defun jabber-connect (username server resource &optional registerp)

emacs-jabber jabber-compose.el,1.3,1.4

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23305

Modified Files:
	jabber-compose.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-347
Creator:  Magnus Henoch <ma...@fr...>

Multiaccountify jabber-compose


Index: jabber-compose.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-compose.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** jabber-compose.el	15 Jul 2006 12:15:32 -0000	1.3
--- jabber-compose.el	18 Apr 2007 22:51:20 -0000	1.4
***************
*** 1,5 ****
  ;;; jabber-compose.el --- compose a Jabber message in a buffer
  
! ;; Copyright (C) 2006  Magnus Henoch
  
  ;; Author: Magnus Henoch <ma...@fr...>
--- 1,5 ----
  ;;; jabber-compose.el --- compose a Jabber message in a buffer
  
! ;; Copyright (C) 2006, 2007  Magnus Henoch
  
  ;; Author: Magnus Henoch <ma...@fr...>
***************
*** 24,30 ****
  
  ;;;###autoload
! (defun jabber-compose (&optional recipient)
    "Create a buffer for composing a Jabber message."
!   (interactive (list (jabber-read-jid-completing "To whom? ")))
  
    (with-current-buffer (get-buffer-create 
--- 24,31 ----
  
  ;;;###autoload
! (defun jabber-compose (jc &optional recipient)
    "Create a buffer for composing a Jabber message."
!   (interactive (list (jabber-read-account)
! 		     (jabber-read-jid-completing "To whom? ")))
  
    (with-current-buffer (get-buffer-create 
***************
*** 35,38 ****
--- 36,40 ----
  			    (format "-%s" (jabber-jid-displayname recipient))))))
      (set (make-local-variable 'jabber-widget-alist) nil)
+     (setq jabber-buffer-connection jc)
      (use-local-map widget-keymap)
  
***************
*** 72,76 ****
  
      (dolist (to recipients)
!       (jabber-send-message to subject text nil))
  
      (bury-buffer)
--- 74,78 ----
  
      (dolist (to recipients)
!       (jabber-send-message jabber-buffer-connection to subject text nil))
  
      (bury-buffer)