gmane.emacs.jabber.scm
http://blog.gmane.org/gmane.emacs.jabber.scm
hourly
1
1901-01-01T00:00+00:00
Gmane
http://gmane.org/img/gmane-25t.png
http://gmane.org
-
[SCM] emacs-jabber branch, master,updated. 1dca591d17cf084e6d870f55898e9343926f8bb8
http://comments.gmane.org/gmane.emacs.jabber.scm/369
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 1dca591d17cf084e6d870f55898e9343926f8bb8 (commit)
via 5c7c52b066aa92d809b8f9b259f63fe79aed051c (commit)
from f54c1b54b308f38caac66ae567e5f64f6adc631c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1dca591d17cf084e6d870f55898e9343926f8bb8
Author: Magnus Henoch <magnus.henoch< at >gmail.com>
Date: Sat May 19 15:01:05 2012 +0100
Fix reporting of STARTTLS negotiation errors
jabber-starttls-process-input now signals an error on negotiation
failure, as gnutls-negotiate already does. Catch errors in
jabber-core, and put them as disconnection reason in the state data,
to get fewer and less confusing messages in the echo area.
diff --git a/jabber-conn.el b/jabber-conn.el
index 5b4b89f..fba32bf 100644
--- a/jabber-conn.el
+++ b/jabber-conn.el
< at >< at > -252,7 +252,7 < at >< at > connection fails."
(defun jabber-starttls-process-input (fsm xml-data)
"Process result of starttls request.
-Return non-nil on success, nil on failure."
+On failure, signal error."
(cond
((eq (car xml-data) 'proceed)
(let* ((state-data (fsm-get-state-data fsm))
< at >< at > -263,6 +263,8 < at >< at > Return non-nil on success, nil on failure."
(network
(let* ((hostname (plist-get state-data :server))
(verifyp (not (member hostname jabber-invalid-certificate-servers))))
+ ;; gnutls-negotiate might signal an error, which is caught
+ ;; by our caller
(gnutls-negotiate
:process connection
;; This is the hostname that the certificate should be valid for:
< at >< at > -270,9 +272,11 < at >< at > Return non-nil on success, nil on failure."
:verify-hostname-error verifyp
:verify-error verifyp)))
(real
- (starttls-negotiate connection)))))
+ (or
+ (starttls-negotiate connection)
+ (error "Negotiation failure"))))))
((eq (car xml-data) 'failure)
- nil)))
+ (error "Command rejected by server"))))
(defvar *jabber-virtual-server-function* nil
"Function to use for sending stanzas on a virtual connection.
diff --git a/jabber-core.el b/jabber-core.el
index eae787b..58b233d 100644
--- a/jabber-core.el
+++ b/jabber-core.el
< at >< at > -483,11 +483,16 < at >< at > With double prefix argument, specify more connection details."
(jabber-fsm-handle-sentinel state-data event))
(:stanza
- (if (jabber-starttls-process-input fsm (cadr event))
- ;; Connection is encrypted. Send a stream tag again.
- (list :connected (plist-put state-data :encrypted t))
- (message "STARTTLS negotiation failed")
- (list nil state-data)))
+ (condition-case e
+ (progn
+ (jabber-starttls-process-input fsm (cadr event))
+ ;; Connection is encrypted. Send a stream tag again.
+ (list :connected (plist-put state-data :encrypted t)))
+ (error
+(let* ((msg (concat "STARTTLS negotiation failed: "
+ (error-message-string e)))
+ (new-state-data (plist-put state-data :disconnection-reason msg)))
+ (list nil new-state-data)))))
(:do-disconnect
(jabber-send-string fsm "</stream:stream>")
commit 5c7c52b066aa92d809b8f9b259f63fe79aed051c
Author: magnus.henoch< at >gmail.com <magnus.henoch< at >gmail.com>
Date: Sun Feb 5 13:15:43 2012 +0100
Fix error handling for old-style SSL/TLS connections
When connecting to a Jabber server over SSL/TLS without STARTTLS
(the legacy "port 5223" method), any connection error would
cause the state machine to be stuck in the :connecting state,
unable to go back or forward. Fix this by catching and reporting
errors in jabber-ssl-connect.
diff --git a/jabber-conn.el b/jabber-conn.el
index 531d3a0..5b4b89f 100644
--- a/jabber-conn.el
+++ b/jabber-conn.el
< at >< at > -181,14 +181,19 < at >< at > connection fails."
(error "Neither TLS nor SSL connect functions available")))))
(let ((process-buffer (generate-new-buffer jabber-process-buffer))
connection)
- (unwind-protect
+ (setq network-server (or network-server server))
+ (setq port (or port 5223))
+ (condition-case e
(setq connection (funcall connect-function
"jabber"
process-buffer
- (or network-server server)
- (or port 5223)))
-(unless (or connection jabber-debug-keep-process-buffers)
- (kill-buffer process-buffer)))
+ network-server
+ port))
+(error
+ (message "Couldn't connect to %s:%d: %s" network-server port
+ (error-message-string e))))
+ (unless (or connection jabber-debug-keep-process-buffers)
+(kill-buffer process-buffer))
(if connection
(fsm-send fsm (list :connected connection))
(fsm-send fsm :connection-failed)))))
-----------------------------------------------------------------------
Summary of changes:
jabber-conn.el | 25 +++++++++++++++++--------
jabber-core.el | 15 ++++++++++-----
2 files changed, 27 insertions(+), 13 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2012-05-19T14:03:00
-
[SCM] emacs-jabber branch, master,updated. f54c1b54b308f38caac66ae567e5f64f6adc631c
http://comments.gmane.org/gmane.emacs.jabber.scm/368
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via f54c1b54b308f38caac66ae567e5f64f6adc631c (commit)
from c3c8963e895a5aa7cec57d6cb5c7872a7325f361 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f54c1b54b308f38caac66ae567e5f64f6adc631c
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Tue May 15 22:39:43 2012 +0100
Support native GnuTLS for STARTTLS
Emacs 24 supports linking to the GnuTLS library. Let's use it when
available.
Also add a customisable variable for ignoring invalid certificates.
We should now be validating certificates against the XMPP server name,
not the hostname from DNS SRV, so there should be less need for this
now, but there's always the occasional basement server with a
self-signed certificate...
diff --git a/jabber-conn.el b/jabber-conn.el
index 80b1cca..531d3a0 100644
--- a/jabber-conn.el
+++ b/jabber-conn.el
< at >< at > -27,6 +27,9 < at >< at >
(eval-when-compile (require 'cl))
+;; Emacs 24 can be linked with GnuTLS
+(ignore-errors (require 'gnutls))
+
;; Try two different TLS/SSL libraries, but don't fail if none available.
(or (ignore-errors (require 'tls))
(ignore-errors (require 'ssl)))
< at >< at > -45,11 +48,13 < at >< at >
(defun jabber-have-starttls ()
"Return true if we can use STARTTLS."
- (and (featurep 'starttls)
- (or (and (bound-and-true-p starttls-gnutls-program)
-(executable-find starttls-gnutls-program))
- (and (bound-and-true-p starttls-program)
-(executable-find starttls-program)))))
+ (or (and (fboundp 'gnutls-available-p)
+ (gnutls-available-p))
+ (and (featurep 'starttls)
+ (or (and (bound-and-true-p starttls-gnutls-program)
+ (executable-find starttls-gnutls-program))
+ (and (bound-and-true-p starttls-program)
+ (executable-find starttls-program))))))
(defconst jabber-default-connection-type
(cond
< at >< at > -72,6 +77,16 < at >< at > nil means prefer gnutls but fall back to openssl.
(const :tag "Use openssl" openssl))
:group 'jabber-conn)
+(defcustom jabber-invalid-certificate-servers ()
+ "Jabber servers for which we accept invalid TLS certificates.
+This is a list of server names, each matching the hostname part
+of your JID.
+
+This option has effect only when using native GnuTLS in Emacs 24
+or later."
+ :type '(repeat string)
+ :group 'jabber-conn)
+
(defvar jabber-connect-methods
'((network jabber-network-connect jabber-network-send)
(starttls jabber-starttls-connect jabber-ssl-send)
< at >< at > -191,9 +206,19 < at >< at > connection succeeds. Send a message :connection-failed if
connection fails."
(let ((coding-system-for-read 'utf-8)
(coding-system-for-write 'utf-8)
-(targets (jabber-srv-targets server network-server port)))
- (unless (fboundp 'starttls-open-stream)
- (error "starttls.el not available"))
+(targets (jabber-srv-targets server network-server port))
+(connect-function
+ (cond
+ ((and (fboundp 'gnutls-available-p)
+(gnutls-available-p))
+ (lambda (buffer host port)
+ (open-network-stream "jabber" buffer host port)))
+ ((fboundp 'starttls-open-stream)
+ (lambda (buffer host port)
+ (starttls-open-stream "jabber" buffer host port)))
+ (t
+ (error "Neither native GnuTLS nor starttls.el available")))))
+
(catch 'connected
(dolist (target targets)
(condition-case e
< at >< at > -201,11 +226,10 < at >< at > connection fails."
connection)
(unwind-protect
(setq connection
-(starttls-open-stream
- "jabber"
- process-buffer
- (car target)
- (cdr target)))
+(funcall connect-function
+ process-buffer
+ (car target)
+ (cdr target)))
(unless (or connection jabber-debug-keep-process-buffers)
(kill-buffer process-buffer)))
(when connection
< at >< at > -226,7 +250,22 < at >< at > connection fails."
Return non-nil on success, nil on failure."
(cond
((eq (car xml-data) 'proceed)
- (starttls-negotiate (plist-get (fsm-get-state-data fsm) :connection)))
+ (let* ((state-data (fsm-get-state-data fsm))
+ (connection (plist-get state-data :connection)))
+ ;; Did we use open-network-stream or starttls-open-stream? We
+ ;; can tell by process-type.
+ (case (process-type connection)
+(network
+ (let* ((hostname (plist-get state-data :server))
+(verifyp (not (member hostname jabber-invalid-certificate-servers))))
+ (gnutls-negotiate
+ :process connection
+ ;; This is the hostname that the certificate should be valid for:
+ :hostname hostname
+ :verify-hostname-error verifyp
+ :verify-error verifyp)))
+(real
+ (starttls-negotiate connection)))))
((eq (car xml-data) 'failure)
nil)))
-----------------------------------------------------------------------
Summary of changes:
jabber-conn.el | 67 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 14 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2012-05-15T21:28:19
-
[SCM] emacs-jabber branch, master,updated. c3c8963e895a5aa7cec57d6cb5c7872a7325f361
http://comments.gmane.org/gmane.emacs.jabber.scm/367
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via c3c8963e895a5aa7cec57d6cb5c7872a7325f361 (commit)
from 0b8d811023c7adfeac5a1267f2933651d550b2e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c3c8963e895a5aa7cec57d6cb5c7872a7325f361
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Sun Apr 15 20:45:01 2012 +0100
s/screen/tmux/ in jabber-tmux.el
Too much copy & paste can be a bad thing...
diff --git a/jabber-tmux.el b/jabber-tmux.el
index 27ca309..379f839 100644
--- a/jabber-tmux.el
+++ b/jabber-tmux.el
< at >< at > -1,4 +1,4 < at >< at >
-;; jabber-screen.el - emacs-jabber interface to screen
+;; jabber-tmux.el - emacs-jabber interface to tmux
;; Copyright (C) 2012 - Michael Cardell Widerkrantz <mc< at >hack.org>
-----------------------------------------------------------------------
Summary of changes:
jabber-tmux.el | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2012-04-15T19:35:44
-
[SCM] emacs-jabber branch, master,updated. 0b8d811023c7adfeac5a1267f2933651d550b2e9
http://comments.gmane.org/gmane.emacs.jabber.scm/366
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 0b8d811023c7adfeac5a1267f2933651d550b2e9 (commit)
via 295525b6183187233cba8799b028975ea39a1a51 (commit)
from 9f8ef893f3154864d0c18e55b2c01923388384e1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0b8d811023c7adfeac5a1267f2933651d550b2e9
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Sun Apr 15 11:24:11 2012 +0100
Mention tmux alerts in the documentation
diff --git a/jabber.texi b/jabber.texi
index d11533a..8e3687d 100644
--- a/jabber.texi
+++ b/jabber.texi
< at >< at > -2027,6 +2027,10 < at >< at > The < at >code{screen} alerts send a message through the Screen terminal
manager< at >footnote{See < at >uref{http://www.gnu.org/software/screen/}.}. They do no
harm if called when you don't use Screen.
+< at >cindex Tmux terminal manager
+The < at >code{tmux} alerts send a message through the tmux terminal
+manager< at >footnote{See < at >uref{http://tmux.sourceforge.net/}.}.
+
< at >cindex Ratpoison window manager
< at >cindex Window manager, Ratpoison
The < at >code{ratpoison} alerts send a message through the Ratpoison
commit 295525b6183187233cba8799b028975ea39a1a51
Author: Michael Cardell Widerkrantz <mc< at >hack.org>
Date: Sun Apr 15 11:21:03 2012 +0100
Add tmux alerts
diff --git a/AUTHORS b/AUTHORS
index 8e5c201..bfb161c 100644
--- a/AUTHORS
+++ b/AUTHORS
< at >< at > -25,5 +25,6 < at >< at > Xavier Maillard
Vitaly Mayatskikh
Alexander Solovyov
Demyan Rogozhin
+Michael Cardell Widerkrantz
arch-tag: 15700144-3BD9-11D9-871C-000A95C2FCD0
diff --git a/Makefile.am b/Makefile.am
index 4a9767f..591711b 100644
--- a/Makefile.am
+++ b/Makefile.am
< at >< at > -22,7 +22,7 < at >< at > jabber-time.el jabber-truncate.el jabber-util.el\
jabber-vcard-avatars.el jabber-vcard.el jabber-version.el\
jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el\
jabber-muc-nick-coloring.el\
-jabber-xml.el jabber.el srv.el
+jabber-xml.el jabber.el srv.el jabber-tmux.el
compat_lisp_sources =
if USE_OUR_SHA1
diff --git a/jabber-tmux.el b/jabber-tmux.el
new file mode 100644
index 0000000..27ca309
--- /dev/null
+++ b/jabber-tmux.el
< at >< at > -0,0 +1,32 < at >< at >
+;; jabber-screen.el - emacs-jabber interface to screen
+
+;; Copyright (C) 2012 - Michael Cardell Widerkrantz <mc< at >hack.org>
+
+;; 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
+
+(eval-when-compile (require 'jabber-alert))
+
+(defun jabber-tmux-message (msg)
+ "Show MSG in tmux"
+ (call-process "tmux" nil nil nil "display-message" msg))
+
+; Automatically defines jabber-{message,muc,presence,info}-tmux
+; functions.
+(define-jabber-alert tmux "Show a message through the tmux terminal multiplexer"
+ 'jabber-tmux-message)
+
+(provide 'jabber-tmux)
diff --git a/jabber.el b/jabber.el
index 906136d..a5c66cf 100644
--- a/jabber.el
+++ b/jabber.el
< at >< at > -148,6 +148,7 < at >< at > configure a Google Talk account like this:
;; External notifiers
(require 'jabber-screen)
+(require 'jabber-tmux)
(require 'jabber-ratpoison)
(require 'jabber-sawfish)
(require 'jabber-festival)
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 1 +
Makefile.am | 2 +-
jabber-screen.el => jabber-tmux.el | 17 +++++++++--------
jabber.el | 1 +
jabber.texi | 4 ++++
5 files changed, 16 insertions(+), 9 deletions(-)
copy jabber-screen.el => jabber-tmux.el (68%)
hooks/post-receive
</pre>
Magnus Henoch
2012-04-15T10:14:40
-
[SCM] emacs-jabber branch, master,updated. 9f8ef893f3154864d0c18e55b2c01923388384e1
http://comments.gmane.org/gmane.emacs.jabber.scm/365
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 9f8ef893f3154864d0c18e55b2c01923388384e1 (commit)
from 7c3e8e98ce458539efe2dd30b3051fbbed06cd01 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9f8ef893f3154864d0c18e55b2c01923388384e1
Author: Evgenii Terechkov <evg< at >altlinux.org>
Date: Fri Apr 13 00:00:49 2012 +0800
Fix build with automake > 1.11.4
diff --git a/configure.ac b/configure.ac
index c3b14a6..d1ff734 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -1,6 +1,6 < at >< at >
AC_INIT([jabber.el], [0.8.91], [emacs-jabber-general< at >lists.sourceforge.net], [emacs-jabber])
AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 dist-lzma dist-zip 1.9])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 dist-xz dist-zip 1.9])
AC_CONFIG_MACRO_DIR([m4])
AM_PATH_LISPDIR
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
</pre>
Evgenii Terechkov
2012-04-12T16:05:43
-
[SCM] emacs-jabber branch, master,updated. 7c3e8e98ce458539efe2dd30b3051fbbed06cd01
http://comments.gmane.org/gmane.emacs.jabber.scm/364
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 7c3e8e98ce458539efe2dd30b3051fbbed06cd01 (commit)
from a98bbc4da6ab878ea3693e6335e2ba6badf1d701 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7c3e8e98ce458539efe2dd30b3051fbbed06cd01
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Mon Feb 6 18:10:04 2012 +0000
Avoid groupchat buffer on RET in roster if we're not 100% sure it's a groupchat (bug 3483380)
* jabber-roster.el (jabber-roster-ret-action-at-point): Ask for disco info before doing anything.
(jabber-roster-ret-action-at-point-1): Only assume it's a groupchat if it explicitly says so.
diff --git a/jabber-roster.el b/jabber-roster.el
index fdc6ff5..8a9f759 100644
--- a/jabber-roster.el
+++ b/jabber-roster.el
< at >< at > -25,6 +25,7 < at >< at >
(require 'jabber-alert)
(require 'jabber-keymap)
(require 'format-spec)
+(require 'cl);for `find'
(defgroup jabber-roster nil "roster display options"
:group 'jabber)
< at >< at > -254,11 +255,27 < at >< at > chat-with-jid-at-point is no group at point"
'jabber-jid)))
(if (and group-at-point account-at-point)
(jabber-roster-roll-group account-at-point group-at-point)
- (jabber-chat-with-jid-at-point)
- (ignore-errors (jabber-muc-join
- account-at-point
- jid-at-point
- (jabber-muc-read-my-nickname account-at-point jid-at-point t) t)))))
+ ;; Is this a normal contact, or a groupchat? Let's ask it.
+ (jabber-disco-get-info
+ account-at-point (jabber-jid-user jid-at-point) nil
+ #'jabber-roster-ret-action-at-point-1
+ jid-at-point))))
+
+(defun jabber-roster-ret-action-at-point-1 (jc jid result)
+ ;; If we get an error, assume it's a normal contact.
+ (if (eq (car result) 'error)
+ (jabber-chat-with jc jid)
+ ;; Otherwise, let's check whether it has a groupchat identity.
+ (let ((identities (car result)))
+ (if (find "conference" (if (sequencep identities) identities nil)
+:key (lambda (i) (aref i 1))
+:test #'string=)
+ ;; Yes! Let's join it.
+ (jabber-muc-join jc jid
+ (jabber-muc-read-my-nickname jc jid t)
+ t)
+;; No. Let's open a normal chat buffer.
+(jabber-chat-with jc jid)))))
(defun jabber-roster-mouse-2-action-at-point (e)
"Action for mouse-2. Before try to roll up/down group. Eval
-----------------------------------------------------------------------
Summary of changes:
jabber-roster.el | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2012-02-06T18:07:43
-
www index.html,1.9,1.10 index.org,1.9,1.10
http://comments.gmane.org/gmane.emacs.jabber.scm/363
<pre>Update of /cvsroot/emacs-jabber/www
In directory vz-cvs-4.sog:/tmp/cvs-serv15884
Modified Files:
index.html index.org
Log Message:
Link to 0.8.91 release
Index: index.html
===================================================================
RCS file: /cvsroot/emacs-jabber/www/index.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- index.html21 Aug 2011 19:04:40 -00001.9
+++ index.html4 Feb 2012 17:24:50 -00001.10
< at >< at > -1,13 +1,13 < at >< at >
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-lang="en" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>jabber.el</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<meta name="title" content="jabber.el"/>
<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-08-21 20:02:35 BST"/>
+<meta name="generated" content="2012-02-04 16:26:10 CET"/>
<meta name="author" content="Magnus Henoch"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
< at >< at > -44,6 +44,12 < at >< at >
dt { font-weight: bold; }
div.figure { padding: 0.5em; }
div.figure p { text-align: center; }
+ div.inlinetask {
+ padding:10px;
+ border:2px solid gray;
+ margin:10px;
+ background: #ffffcc;
+ }
textarea { overflow-x: auto; }
.linenr { font-size:smaller }
.code-highlighted {background-color:#ffff00;}
< at >< at > -79,10 +85,15 < at >< at >
</head>
<body>
-<div id="content">
+<div id="preamble">
+
+</div>
+
+<div id="content">
<h1 class="title">jabber.el</h1>
+
<a href="http://sourceforge.net">
<img border="0" src="http://sourceforge.net/sflogo.php?group_id=88346&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" style="position: absolute; top: 0em; right: 0em;"></a>
< at >< at > -93,24 +104,24 < at >< at >
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul>
-<li><a href="#sec-1">What is Jabber? </a></li>
-<li><a href="#sec-2">What is jabber.el? </a></li>
-<li><a href="#sec-3">Downloading and installing </a>
+<li><a href="#sec-1">What is Jabber?</a></li>
+<li><a href="#sec-2">What is jabber.el?</a></li>
+<li><a href="#sec-3">Downloading and installing</a>
<ul>
-<li><a href="#sec-3-1">Prepackaged </a></li>
-<li><a href="#sec-3-2">Dependencies </a></li>
-<li><a href="#sec-3-3">Downloading </a></li>
-<li><a href="#sec-3-4">Using </a></li>
+<li><a href="#sec-3-1">Prepackaged</a></li>
+<li><a href="#sec-3-2">Dependencies</a></li>
+<li><a href="#sec-3-3">Downloading</a></li>
+<li><a href="#sec-3-4">Using</a></li>
</ul>
</li>
-<li><a href="#sec-4">Reporting bugs </a></li>
-<li><a href="#sec-5">Latest source </a>
+<li><a href="#sec-4">Reporting bugs</a></li>
+<li><a href="#sec-5">Latest source</a>
<ul>
-<li><a href="#sec-5-1">On Sourceforge </a></li>
-<li><a href="#sec-5-2">catap's repository </a></li>
+<li><a href="#sec-5-1">On Sourceforge</a></li>
+<li><a href="#sec-5-2">catap's repository</a></li>
</ul>
</li>
-<li><a href="#sec-6">List of releases </a></li>
+<li><a href="#sec-6">List of releases</a></li>
</ul>
</div>
</div>
< at >< at > -120,7 +131,7 < at >< at >
For the impatient:
</p>
<ul>
-<li>Latest pretest release: <a href="https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber beta versions/0.8.90/">0.8.90</a> (21-Aug-2011) â includes change needed to connect to Google Talk
+<li>Latest pretest release: <a href="https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber beta versions/0.8.91/">0.8.91</a> (3-Feb-2012) â includes change needed to connect to Google Talk
</li>
<li>Latest stable release: <a href="https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber/0.8.0">0.8.0</a> (12-Sep-2009)
</li>
< at >< at > -173,7 +184,7 < at >< at >
<div id="outline-container-1" class="outline-2">
-<h2 id="sec-1">What is Jabber? </h2>
+<h2 id="sec-1">What is Jabber?</h2>
<div class="outline-text-2" id="text-1">
< at >< at > -208,7 +219,7 < at >< at >
</div>
<div id="outline-container-2" class="outline-2">
-<h2 id="sec-2">What is jabber.el? </h2>
+<h2 id="sec-2">What is jabber.el?</h2>
<div class="outline-text-2" id="text-2">
< at >< at > -222,7 +233,7 < at >< at >
</div>
<div id="outline-container-3" class="outline-2">
-<h2 id="sec-3">Downloading and installing </h2>
+<h2 id="sec-3">Downloading and installing</h2>
<div class="outline-text-2" id="text-3">
< at >< at > -230,7 +241,7 < at >< at >
</div>
<div id="outline-container-3-1" class="outline-3">
-<h3 id="sec-3-1">Prepackaged </h3>
+<h3 id="sec-3-1">Prepackaged</h3>
<div class="outline-text-3" id="text-3-1">
< at >< at > -243,7 +254,7 < at >< at >
</div>
<div id="outline-container-3-2" class="outline-3">
-<h3 id="sec-3-2">Dependencies </h3>
+<h3 id="sec-3-2">Dependencies</h3>
<div class="outline-text-3" id="text-3-2">
< at >< at > -266,7 +277,7 < at >< at >
</div>
<div id="outline-container-3-3" class="outline-3">
-<h3 id="sec-3-3">Downloading </h3>
+<h3 id="sec-3-3">Downloading</h3>
<div class="outline-text-3" id="text-3-3">
< at >< at > -286,7 +297,6 < at >< at >
</pre>
-
<p>
Either evaluate those lines, or restart Emacs.
</p>
< at >< at > -295,7 +305,7 < at >< at >
</div>
<div id="outline-container-3-4" class="outline-3">
-<h3 id="sec-3-4">Using </h3>
+<h3 id="sec-3-4">Using</h3>
<div class="outline-text-3" id="text-3-4">
< at >< at > -310,7 +320,7 < at >< at >
</div>
<div id="outline-container-4" class="outline-2">
-<h2 id="sec-4">Reporting bugs </h2>
+<h2 id="sec-4">Reporting bugs</h2>
<div class="outline-text-2" id="text-4">
< at >< at > -324,7 +334,7 < at >< at >
</div>
<div id="outline-container-5" class="outline-2">
-<h2 id="sec-5">Latest source </h2>
+<h2 id="sec-5">Latest source</h2>
<div class="outline-text-2" id="text-5">
< at >< at > -337,7 +347,7 < at >< at >
</div>
<div id="outline-container-5-1" class="outline-3">
-<h3 id="sec-5-1">On Sourceforge </h3>
+<h3 id="sec-5-1">On Sourceforge</h3>
<div class="outline-text-3" id="text-5-1">
< at >< at > -347,7 +357,6 < at >< at >
</pre>
-
<p>
You can also <a href="http://emacs-jabber.git.sourceforge.net/">browse the repository</a> with your web browser.
</p>
< at >< at > -356,7 +365,7 < at >< at >
</div>
<div id="outline-container-5-2" class="outline-3">
-<h3 id="sec-5-2">catap's repository </h3>
+<h3 id="sec-5-2">catap's repository</h3>
<div class="outline-text-3" id="text-5-2">
< at >< at > -367,14 +376,13 < at >< at >
-
</div>
</div>
</div>
<div id="outline-container-6" class="outline-2">
-<h2 id="sec-6">List of releases </h2>
+<h2 id="sec-6">List of releases</h2>
<div class="outline-text-2" id="text-6">
< at >< at > -383,11 +391,13 < at >< at >
</p>
</div>
</div>
+</div>
+
<div id="postamble">
-<p class="date">Date: 2011-08-21 20:02:35 BST</p>
-<p class="creator">Org version 7.6 with Emacs version 24</p>
+<p class="date">Date: 2012-02-04 16:26:10 CET</p>
+<p class="creator">Org version 7.8.03 with Emacs version 24</p>
<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
-</div>
+
</div>
</body>
</html>
Index: index.org
===================================================================
RCS file: /cvsroot/emacs-jabber/www/index.org,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- index.org21 Aug 2011 19:04:40 -00001.9
+++ index.org4 Feb 2012 17:24:50 -00001.10
< at >< at > -13,7 +13,7 < at >< at >
# <<impatient>>
For the impatient:
- - Latest pretest release: [[https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber%20beta%20versions/0.8.90/][0.8.90]] (21-Aug-2011) â includes change needed to connect to Google Talk
+ - Latest pretest release: [[https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber%20beta%20versions/0.8.91/][0.8.91]] (3-Feb-2012) â includes change needed to connect to Google Talk
- Latest stable release: [[https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber/0.8.0][0.8.0]] (12-Sep-2009)
- Full [[file:list-of-releases.org][list of releases]], including lists of features and changes
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2_______________________________________________
Emacs-jabber-commit mailing list
Emacs-jabber-commit< at >lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emacs-jabber-commit
</pre>
Magnus Henoch
2012-02-04T17:24:52
-
[SCM] emacs-jabber branch, master,updated. a98bbc4da6ab878ea3693e6335e2ba6badf1d701
http://comments.gmane.org/gmane.emacs.jabber.scm/362
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via a98bbc4da6ab878ea3693e6335e2ba6badf1d701 (commit)
via faf2e9e7aaf9f5c8a539934c916614eb6e6a487c (commit)
from 4ff9b48fbe8e646ef12d3777f0110b8139f1a3ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a98bbc4da6ab878ea3693e6335e2ba6badf1d701
Author: magnus.henoch< at >gmail.com <magnus.henoch< at >gmail.com>
Date: Fri Feb 3 13:29:41 2012 +0000
Version 0.8.91
diff --git a/configure.ac b/configure.ac
index 05736aa..c3b14a6 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -1,4 +1,4 < at >< at >
-AC_INIT([jabber.el], [0.8.90], [emacs-jabber-general< at >lists.sourceforge.net], [emacs-jabber])
+AC_INIT([jabber.el], [0.8.91], [emacs-jabber-general< at >lists.sourceforge.net], [emacs-jabber])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 dist-lzma dist-zip 1.9])
AC_CONFIG_MACRO_DIR([m4])
commit faf2e9e7aaf9f5c8a539934c916614eb6e6a487c
Author: magnus.henoch< at >gmail.com <magnus.henoch< at >gmail.com>
Date: Fri Feb 3 13:22:42 2012 +0000
* jabberd.el (jabberd-handle): Update for new namespace handling.
diff --git a/tests/jabberd.el b/tests/jabberd.el
index 5b6feab..0985687 100644
--- a/tests/jabberd.el
+++ b/tests/jabberd.el
< at >< at > -73,8 +73,8 < at >< at > arguments, the client FSM and the stanza.")
;; If so, send <stream:features>.
(when (string-match "version=[\"']" stanza)
(jabberd-send fsm
-'(stream:features
- ()
+'(features
+ ((xmlns . "http://etherx.jabber.org/streams"))
;; Interesting implementation details
;; of jabber.el permit us to send all
;; features at once, without caring about
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
tests/jabberd.el | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2012-02-03T16:54:31
-
[SCM] emacs-jabber branch, master,updated. 4ff9b48fbe8e646ef12d3777f0110b8139f1a3ee
http://comments.gmane.org/gmane.emacs.jabber.scm/361
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 4ff9b48fbe8e646ef12d3777f0110b8139f1a3ee (commit)
from a034d4b330d23643169880e96e34e0cf61b76a11 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4ff9b48fbe8e646ef12d3777f0110b8139f1a3ee
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Wed Dec 21 18:38:38 2011 +0000
Use namespace prefixes declared on stream root element
* jabber-core.el (jabber-namespace-prefixes): New variable.
(jabber-connection) [:connected, :bind]: Expect features instead
of stream:features.
(jabber-filter): Save namespace prefixes from stream root element.
Use saved prefixes when parsing stanzas.
* jabber-xml.el (jabber-xml-resolve-namespace-prefixes): Move the merging part...
(jabber-xml-merge-namespace-declarations): ...into this new function.
diff --git a/jabber-core.el b/jabber-core.el
index 8b558a8..eae787b 100644
--- a/jabber-core.el
+++ b/jabber-core.el
< at >< at > -64,6 +64,10 < at >< at >
(defvar jabber-choked-timer nil)
+(defvar jabber-namespace-prefixes nil
+ "XML namespace prefixes used for the current connection.")
+(make-variable-buffer-local 'jabber-namespace-prefixes)
+
(defgroup jabber-core nil "customize core functionality"
:group 'jabber)
< at >< at > -440,7 +444,7 < at >< at > With double prefix argument, specify more connection details."
(let ((stanza (cadr event)))
(cond
;; At this stage, we only expect a stream:features stanza.
-((not (eq (jabber-xml-node-name stanza) 'stream:features))
+((not (eq (jabber-xml-node-name stanza) 'features))
(list nil (plist-put state-data
:disconnection-reason
(format "Unexpected stanza %s" stanza))))
< at >< at > -632,7 +636,7 < at >< at > With double prefix argument, specify more connection details."
(:stanza
(let ((stanza (cadr event)))
(cond
-((eq (jabber-xml-node-name stanza) 'stream:features)
+((eq (jabber-xml-node-name stanza) 'features)
(if (and (jabber-xml-get-children stanza 'bind)
(jabber-xml-get-children stanza 'session))
(labels
< at >< at > -862,7 +866,14 < at >< at > DATA is any sexp."
(stream-header (car (xml-parse-region (point-min) ending-at)))
(session-id (jabber-xml-get-attribute stream-header 'id))
(stream-version (jabber-xml-get-attribute stream-header 'version)))
-
+
+ ;; Need to keep any namespace attributes on the stream
+ ;; header, as they can affect any stanza in the
+ ;; stream...
+ (setq jabber-namespace-prefixes
+ (jabber-xml-merge-namespace-declarations
+ (jabber-xml-node-attributes stream-header)
+ nil))
(jabber-log-xml fsm "receive" stream-header)
(fsm-send fsm (list :stream-start session-id stream-version))
(delete-region (point-min) ending-at)))
< at >< at > -898,7 +909,9 < at >< at > DATA is any sexp."
(sit-for 2)))
(delete-region (point-min) (point))
- (fsm-send fsm (list :stanza (jabber-xml-resolve-namespace-prefixes (car xml-data))))
+ (fsm-send fsm (list :stanza
+ (jabber-xml-resolve-namespace-prefixes
+ (car xml-data) nil jabber-namespace-prefixes)))
;; XXX: move this logic elsewhere
;; We explicitly don't catch errors in jabber-process-input,
;; to facilitate debugging.
diff --git a/jabber-xml.el b/jabber-xml.el
index 88878fe..46762ed 100644
--- a/jabber-xml.el
+++ b/jabber-xml.el
< at >< at > -226,22 +226,8 < at >< at > any string character data of this node"
(defun jabber-xml-resolve-namespace-prefixes (xml-data &optional default-ns prefixes)
(let ((node-name (jabber-xml-node-name xml-data))
(attrs (jabber-xml-node-attributes xml-data)))
- ;; First find any foo:xmlns attributes..
- (dolist (attr attrs)
- (let ((attr-name (symbol-name (car attr))))
-(when (string-match "xmlns:" attr-name)
- (let ((prefix (substring attr-name (match-end 0)))
-(ns-uri (cdr attr)))
- ;; A slightly complicated dance to never change the
- ;; original value of prefixes (since the caller depends on
- ;; it), but also to avoid excessive copying (which remove
- ;; always does). Might need to profile and tweak this for
- ;; performance.
- (setq prefixes
- (cons (cons prefix ns-uri)
-(if (assoc prefix prefixes)
- (remove (assoc prefix prefixes) prefixes)
- prefixes)))))))
+ (setq prefixes (jabber-xml-merge-namespace-declarations attrs prefixes))
+
;; If there is an xmlns attribute, it is the new default
;; namespace.
(let ((xmlns (jabber-xml-get-xmlns xml-data)))
< at >< at > -267,6 +253,25 < at >< at > any string character data of this node"
(jabber-xml-node-children xml-data))
xml-data))
+(defun jabber-xml-merge-namespace-declarations (attrs prefixes)
+ ;; First find any xmlns:foo attributes..
+ (dolist (attr attrs)
+ (let ((attr-name (symbol-name (car attr))))
+ (when (string-match "xmlns:" attr-name)
+(let ((prefix (substring attr-name (match-end 0)))
+ (ns-uri (cdr attr)))
+ ;; A slightly complicated dance to never change the
+ ;; original value of prefixes (since the caller depends on
+ ;; it), but also to avoid excessive copying (which remove
+ ;; always does). Might need to profile and tweak this for
+ ;; performance.
+ (setq prefixes
+(cons (cons prefix ns-uri)
+(if (assoc prefix prefixes)
+ (remove (assoc prefix prefixes) prefixes)
+ prefixes)))))))
+ prefixes)
+
(provide 'jabber-xml)
;;; arch-tag: ca206e65-7026-4ee8-9af2-ff6a9c5af98a
-----------------------------------------------------------------------
Summary of changes:
jabber-core.el | 21 +++++++++++++++++----
jabber-xml.el | 37 +++++++++++++++++++++----------------
2 files changed, 38 insertions(+), 20 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2011-12-21T22:17:48
-
[SCM] emacs-jabber branch, master,updated. a034d4b330d23643169880e96e34e0cf61b76a11
http://comments.gmane.org/gmane.emacs.jabber.scm/360
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via a034d4b330d23643169880e96e34e0cf61b76a11 (commit)
from dc9fc0fa06ff8a18b5599572671ce598374aa83c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a034d4b330d23643169880e96e34e0cf61b76a11
Author: Jeremy Compostella <jerry< at >Apollo.jerryland.fr>
Date: Thu Dec 15 22:31:34 2011 +0100
jabber-core: Fix header parsing
The (1+ (match-end 0)) is a mistake. Indeed, after the replace-match
call the (match-end 0) point has changed to be at the end of the
replaced string. So calling (point) is more than enough.
Signed-off-by: Magnus Henoch <legoscia< at >users.sourceforge.net>
diff --git a/AUTHORS b/AUTHORS
index 4f60098..8e5c201 100644
--- a/AUTHORS
+++ b/AUTHORS
< at >< at > -7,6 +7,7 < at >< at > Evgenii Terechkov
Contributors:
Anthony Chaumas-Pellet
+Jérémy Compostella
Mathias Dahl
Mario Domenech Goulart
Nolan Eakins
diff --git a/jabber-core.el b/jabber-core.el
index 21d0d96..8b558a8 100644
--- a/jabber-core.el
+++ b/jabber-core.el
< at >< at > -858,8 +858,7 < at >< at > DATA is any sexp."
;; Let's pretend that the stream header is a closed tag,
;; and parse it as such.
(replace-match "/>" t t nil 1)
- (let* (;; Thus we need to add one to the index...
-(ending-at (1+ (match-end 0)))
+ (let* ((ending-at (point))
(stream-header (car (xml-parse-region (point-min) ending-at)))
(session-id (jabber-xml-get-attribute stream-header 'id))
(stream-version (jabber-xml-get-attribute stream-header 'version)))
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 1 +
jabber-core.el | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2011-12-18T22:38:54
-
[SCM] emacs-jabber branch, master,updated. dc9fc0fa06ff8a18b5599572671ce598374aa83c
http://comments.gmane.org/gmane.emacs.jabber.scm/359
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via dc9fc0fa06ff8a18b5599572671ce598374aa83c (commit)
via 9c8bea1bd5d68b49bc4d4675911d6c7d7fd10b95 (commit)
via a1bdfc5bb1bf46dab30031ca774484630fa17feb (commit)
from 3dd51cf94e3da967a4678ab3c13d78c10ef43c8d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
NEWS | 5 +++++
configure.ac | 2 +-
jabber-core.el | 32 ++++++++++----------------------
jabber-roster.el | 7 ++++---
4 files changed, 20 insertions(+), 26 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2011-10-02T20:04:08
-
[SCM] emacs-jabber branch, namespace-prefixes,updated. dc9fc0fa06ff8a18b5599572671ce598374aa83c
http://comments.gmane.org/gmane.emacs.jabber.scm/358
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, namespace-prefixes has been updated
via dc9fc0fa06ff8a18b5599572671ce598374aa83c (commit)
via 9c8bea1bd5d68b49bc4d4675911d6c7d7fd10b95 (commit)
from a1bdfc5bb1bf46dab30031ca774484630fa17feb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit dc9fc0fa06ff8a18b5599572671ce598374aa83c
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Sun Oct 2 21:00:19 2011 +0100
Fix :get function for jabber-roster-default-group-name
diff --git a/jabber-roster.el b/jabber-roster.el
index d12c4ea..fdc6ff5 100644
--- a/jabber-roster.el
+++ b/jabber-roster.el
< at >< at > -155,9 +155,10 < at >< at > Trailing newlines are always removed, regardless of this variable."
:group 'jabber-roster
:type 'string
:get '(lambda (var)
- (if (stringp var)
- (set-text-properties 0 (length var) nil var)
- var))
+ (let ((val (symbol-value var)))
+ (if (stringp val)
+(set-text-properties 0 (length val) nil val)
+ val)))
:set '(lambda (var val)
(if (stringp val)
(set-text-properties 0 (length val) nil val))
commit 9c8bea1bd5d68b49bc4d4675911d6c7d7fd10b95
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Sun Oct 2 19:28:21 2011 +0100
Use xml-parse-region to parse stream header
This lets us get rid of some ugly hacks, and will make it easier to
extract other attributes from the header.
diff --git a/jabber-core.el b/jabber-core.el
index b2a1fa5..21d0d96 100644
--- a/jabber-core.el
+++ b/jabber-core.el
< at >< at > -854,30 +854,18 < at >< at > DATA is any sexp."
(return (fsm-send fsm :stream-end)))
;; Stream header?
- (when (looking-at "<stream:stream[^>]*>")
- (let ((stream-header (match-string 0))
- (ending-at (match-end 0))
- session-id stream-version)
- ;; These regexps extract attribute values from the stream
- ;; header, taking into account that the quotes may be either
- ;; single or double quotes.
- (setq session-id
- (and (or (string-match "id='\\([^']+\\)'" stream-header)
- (string-match "id=\"\\([^\"]+\\)\"" stream-header))
- (jabber-unescape-xml (match-string 1 stream-header))))
- (setq stream-version
- (and (or
- (string-match "version='\\([0-9.]+\\)'" stream-header)
- (string-match "version=\"\\([0-9.]+\\)\"" stream-header))
- (match-string 1 stream-header)))
- (jabber-log-xml fsm "receive" stream-header)
+ (when (looking-at "<stream:stream[^>]*\\(>\\)")
+ ;; Let's pretend that the stream header is a closed tag,
+ ;; and parse it as such.
+ (replace-match "/>" t t nil 1)
+ (let* (;; Thus we need to add one to the index...
+(ending-at (1+ (match-end 0)))
+(stream-header (car (xml-parse-region (point-min) ending-at)))
+(session-id (jabber-xml-get-attribute stream-header 'id))
+(stream-version (jabber-xml-get-attribute stream-header 'version)))
- ;; If the server is XMPP compliant, i.e. there is a version attribute
- ;; and it's >= 1.0, there will be a stream:features tag shortly,
- ;; so just wait for that.
-
+ (jabber-log-xml fsm "receive" stream-header)
(fsm-send fsm (list :stream-start session-id stream-version))
-
(delete-region (point-min) ending-at)))
;; Normal tag
-----------------------------------------------------------------------
Summary of changes:
jabber-core.el | 32 ++++++++++----------------------
jabber-roster.el | 7 ++++---
2 files changed, 14 insertions(+), 25 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2011-10-02T20:01:00
-
[SCM] emacs-jabber branch, master,updated. 3dd51cf94e3da967a4678ab3c13d78c10ef43c8d
http://comments.gmane.org/gmane.emacs.jabber.scm/357
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 3dd51cf94e3da967a4678ab3c13d78c10ef43c8d (commit)
from d30ef9b989065f6e714cf1781bbd0e7e4039681c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
jabber-core.el | 2 +-
jabber-xml.el | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2011-10-02T20:00:48
-
[SCM] emacs-jabber tag, release-0_8_90,created. a1bdfc5bb1bf46dab30031ca774484630fa17feb
http://comments.gmane.org/gmane.emacs.jabber.scm/356
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The tag, release-0_8_90 has been created
at a1bdfc5bb1bf46dab30031ca774484630fa17feb (commit)
- Log -----------------------------------------------------------------
commit a1bdfc5bb1bf46dab30031ca774484630fa17feb
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Sun Aug 21 15:51:17 2011 +0100
Version 0.8.90
* configure.ac: Bump version to 0.8.90.
* NEWS: Mention namespace prefix handling.
-----------------------------------------------------------------------
hooks/post-receive
</pre>
Magnus Henoch
2011-08-21T19:08:30
-
www index.html,1.8,1.9 index.org,1.8,1.9
http://comments.gmane.org/gmane.emacs.jabber.scm/355
<pre>Update of /cvsroot/emacs-jabber/www
In directory vz-cvs-4.sog:/tmp/cvs-serv7687
Modified Files:
index.html index.org
Log Message:
Link to 0.8.90 release
Index: index.html
===================================================================
RCS file: /cvsroot/emacs-jabber/www/index.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- index.html20 Aug 2011 21:38:34 -00001.8
+++ index.html21 Aug 2011 19:04:40 -00001.9
< at >< at > -1,13 +1,13 < at >< at >
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
lang="en" xml:lang="en">
<head>
<title>jabber.el</title>
-<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-08-20 22:26:40 BST"/>
+<meta name="generated" content="2011-08-21 20:02:35 BST"/>
<meta name="author" content="Magnus Henoch"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
< at >< at > -120,7 +120,9 < at >< at >
For the impatient:
</p>
<ul>
-<li>Latest release: <a href="https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber/0.8.0">0.8.0</a> (12-Sep-2009)
+<li>Latest pretest release: <a href="https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber beta versions/0.8.90/">0.8.90</a> (21-Aug-2011) â includes change needed to connect to Google Talk
+</li>
+<li>Latest stable release: <a href="https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber/0.8.0">0.8.0</a> (12-Sep-2009)
</li>
<li>Full <a href="list-of-releases.html">list of releases</a>, including lists of features and changes
</li>
< at >< at > -382,7 +384,7 < at >< at >
</div>
</div>
<div id="postamble">
-<p class="date">Date: 2011-08-20 22:26:40 BST</p>
+<p class="date">Date: 2011-08-21 20:02:35 BST</p>
<p class="creator">Org version 7.6 with Emacs version 24</p>
<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
</div>
Index: index.org
===================================================================
RCS file: /cvsroot/emacs-jabber/www/index.org,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- index.org20 Aug 2011 21:38:34 -00001.8
+++ index.org21 Aug 2011 19:04:40 -00001.9
< at >< at > -13,7 +13,8 < at >< at >
# <<impatient>>
For the impatient:
- - Latest release: [[https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber/0.8.0][0.8.0]] (12-Sep-2009)
+ - Latest pretest release: [[https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber%20beta%20versions/0.8.90/][0.8.90]] (21-Aug-2011) â includes change needed to connect to Google Talk
+ - Latest stable release: [[https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber/0.8.0][0.8.0]] (12-Sep-2009)
- Full [[file:list-of-releases.org][list of releases]], including lists of features and changes
External resources:
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2_______________________________________________
Emacs-jabber-commit mailing list
Emacs-jabber-commit< at >lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emacs-jabber-commit
</pre>
Magnus Henoch
2011-08-21T19:04:42
-
[SCM] emacs-jabber branch, namespace-prefixes,updated. a1bdfc5bb1bf46dab30031ca774484630fa17feb
http://comments.gmane.org/gmane.emacs.jabber.scm/354
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, namespace-prefixes has been updated
via a1bdfc5bb1bf46dab30031ca774484630fa17feb (commit)
from 3dd51cf94e3da967a4678ab3c13d78c10ef43c8d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a1bdfc5bb1bf46dab30031ca774484630fa17feb
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Sun Aug 21 15:51:17 2011 +0100
Version 0.8.90
* configure.ac: Bump version to 0.8.90.
* NEWS: Mention namespace prefix handling.
diff --git a/NEWS b/NEWS
index 74892e7..c89cbda 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -22,6 +22,11 < at >< at > MUC participants list format is now customizable: see
jabber-muc-print-names-format in manual. Also, participants sorted by
role.
+** Treat XML namespace prefixes correctly
+A change in the Google Talk server has brought to light the fact that
+jabber.el didn't handle XML namespace prefixes correctly. This should
+be fixed by the new jabber-xml-resolve-namespace-prefixes function.
+
* New features in jabber.el 0.8
** Support for multiple accounts
Configuration variables have changed. See section "Account settings"
diff --git a/configure.ac b/configure.ac
index 64d1088..05736aa 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -1,4 +1,4 < at >< at >
-AC_INIT([jabber.el], [0.8.0], [emacs-jabber-general< at >lists.sourceforge.net], [emacs-jabber])
+AC_INIT([jabber.el], [0.8.90], [emacs-jabber-general< at >lists.sourceforge.net], [emacs-jabber])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 dist-lzma dist-zip 1.9])
AC_CONFIG_MACRO_DIR([m4])
-----------------------------------------------------------------------
Summary of changes:
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
</pre>
Magnus Henoch
2011-08-21T14:52:22
-
www index.html,1.7,1.8 index.org,1.7,1.8
http://comments.gmane.org/gmane.emacs.jabber.scm/353
<pre>Update of /cvsroot/emacs-jabber/www
In directory vz-cvs-4.sog:/tmp/cvs-serv10177
Modified Files:
index.html index.org
Log Message:
Update xmpp.org links
Index: index.html
===================================================================
RCS file: /cvsroot/emacs-jabber/www/index.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- index.html12 Sep 2009 14:17:29 -00001.7
+++ index.html20 Aug 2011 21:38:34 -00001.8
< at >< at > -1,3 +1,4 < at >< at >
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
< at >< at > -6,18 +7,23 < at >< at >
<title>jabber.el</title>
<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2009-09-12 15:29:40 BST"/>
-<meta name="author" content="Magnus"/>
+<meta name="generated" content="2011-08-20 22:26:40 BST"/>
+<meta name="author" content="Magnus Henoch"/>
+<meta name="description" content=""/>
+<meta name="keywords" content=""/>
<style type="text/css">
- <![CDATA[
+ <!--/*--><![CDATA[/*><!--*/
html { font-family: Times, serif; font-size: 12pt; }
.title { text-align: center; }
.todo { color: red; }
.done { color: green; }
- .tag { background-color:lightblue; font-weight:normal }
+ .tag { background-color: #add8e6; font-weight:normal }
.target { }
- .timestamp { color: grey }
- .timestamp-kwd { color: CadetBlue }
+ .timestamp { color: #bebebe; }
+ .timestamp-kwd { color: #5f9ea0; }
+ .right {margin-left:auto; margin-right:0px; text-align:right;}
+ .left {margin-left:0px; margin-right:auto; text-align:left;}
+ .center {margin-left:auto; margin-right:auto; text-align:center;}
p.verse { margin-left: 3% }
pre {
border: 1pt solid #AEBDCC;
< at >< at > -28,19 +34,54 < at >< at >
overflow:auto;
}
table { border-collapse: collapse; }
- td, th { vertical-align: top; }
+ td, th { vertical-align: top; }
+ th.right { text-align:center; }
+ th.left { text-align:center; }
+ th.center { text-align:center; }
+ td.right { text-align:right; }
+ td.left { text-align:left; }
+ td.center { text-align:center; }
dt { font-weight: bold; }
-
+ div.figure { padding: 0.5em; }
+ div.figure p { text-align: center; }
+ textarea { overflow-x: auto; }
+ .linenr { font-size:smaller }
+ .code-highlighted {background-color:#ffff00;}
.org-info-js_info-navigation { border-style:none; }
#org-info-js_console-label { font-size:10px; font-weight:bold;
white-space:nowrap; }
.org-info-js_search-highlight {background-color:#ffff00; color:#000000;
font-weight:bold; }
- ]]>
+ /*]]>*/-->
</style>
-</head><body>
-<h1 class="title">jabber.el</h1>
+<script type="text/javascript">
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+ var target = document.getElementById(id);
+ if(null != target) {
+ elem.cacheClassElem = elem.className;
+ elem.cacheClassTarget = target.className;
+ target.className = "code-highlighted";
+ elem.className = "code-highlighted";
+ }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+ var target = document.getElementById(id);
+ if(elem.cacheClassElem)
+ elem.className = elem.cacheClassElem;
+ if(elem.cacheClassTarget)
+ target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+
+</head>
+<body>
+<div id="content">
+<h1 class="title">jabber.el</h1>
<a href="http://sourceforge.net">
<img border="0" src="http://sourceforge.net/sflogo.php?group_id=88346&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" style="position: absolute; top: 0em; right: 0em;"></a>
< at >< at > -52,24 +93,24 < at >< at >
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul>
-<li><a href="#sec-1">What is Jabber?</a></li>
-<li><a href="#sec-2">What is jabber.el?</a></li>
-<li><a href="#sec-3">Downloading and installing</a>
+<li><a href="#sec-1">What is Jabber? </a></li>
+<li><a href="#sec-2">What is jabber.el? </a></li>
+<li><a href="#sec-3">Downloading and installing </a>
<ul>
-<li><a href="#sec-3.1">Prepackaged</a></li>
-<li><a href="#sec-3.2">Dependencies</a></li>
-<li><a href="#sec-3.3">Downloading</a></li>
-<li><a href="#sec-3.4">Using</a></li>
+<li><a href="#sec-3-1">Prepackaged </a></li>
+<li><a href="#sec-3-2">Dependencies </a></li>
+<li><a href="#sec-3-3">Downloading </a></li>
+<li><a href="#sec-3-4">Using </a></li>
</ul>
</li>
-<li><a href="#sec-4">Reporting bugs</a></li>
-<li><a href="#sec-5">Latest source</a>
+<li><a href="#sec-4">Reporting bugs </a></li>
+<li><a href="#sec-5">Latest source </a>
<ul>
-<li><a href="#sec-5.1">On Sourceforge</a></li>
-<li><a href="#sec-5.2">catap's repository</a></li>
+<li><a href="#sec-5-1">On Sourceforge </a></li>
+<li><a href="#sec-5-2">catap's repository </a></li>
</ul>
</li>
-<li><a href="#sec-6">List of releases</a></li>
+<li><a href="#sec-6">List of releases </a></li>
</ul>
</div>
</div>
< at >< at > -79,73 +120,69 < at >< at >
For the impatient:
</p>
<ul>
-<li>
-Latest release: <a href="https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber/0.8.0">0.8.0</a> (12-Sep-2009)
+<li>Latest release: <a href="https://sourceforge.net/projects/emacs-jabber/files/emacs-jabber/0.8.0">0.8.0</a> (12-Sep-2009)
</li>
-<li>
-Full <a href="list-of-releases.html">list of releases</a>, including lists of features and changes
-
+<li>Full <a href="list-of-releases.html">list of releases</a>, including lists of features and changes
</li>
</ul>
-<p>External resources:
+
+<p>
+External resources:
</p>
<ul>
-<li>
-<a href="http://sourceforge.net/projects/emacs-jabber/">Sourceforge project page</a>, containing:
+<li><a href="http://sourceforge.net/projects/emacs-jabber/">Sourceforge project page</a>, containing:
<ul>
-<li>
-trackers for
-<a href="http://sourceforge.net/tracker/?atid=586350&amp;group_id=88346&amp;func=browse">bugs</a>,
-<a href="http://sourceforge.net/tracker/?atid=586353&amp;group_id=88346&amp;func=browse">feature requests</a>,
-<a href="http://sourceforge.net/tracker/?atid=586352&amp;group_id=88346&amp;func=browse">patches</a> and
-<a href="http://sourceforge.net/tracker/?atid=586351&amp;group_id=88346&amp;func=browse">support requests</a>, open for anonymous posters
+<li>trackers for
+ <a href="http://sourceforge.net/tracker/?atid=586350&amp;group_id=88346&amp;func=browse">bugs</a>,
+ <a href="http://sourceforge.net/tracker/?atid=586353&amp;group_id=88346&amp;func=browse">feature requests</a>,
+ <a href="http://sourceforge.net/tracker/?atid=586352&amp;group_id=88346&amp;func=browse">patches</a> and
+ <a href="http://sourceforge.net/tracker/?atid=586351&amp;group_id=88346&amp;func=browse">support requests</a>, open for anonymous posters
</li>
-<li>
-<a href="http://sourceforge.net/forum/?group_id=88346">forums</a>, open for anonymous posters
+<li><a href="http://sourceforge.net/forum/?group_id=88346">forums</a>, open for anonymous posters
</li>
</ul>
+
</li>
-<li>
-<a href="http://www.emacswiki.org/cgi-bin/wiki/JabberEl">the JabberEl page of EmacsWiki</a>
+<li><a href="http://www.emacswiki.org/cgi-bin/wiki/JabberEl">the JabberEl page of EmacsWiki</a>
</li>
-<li>
-Mailing lists (also available at <a href="http://gmane.net">Gmane</a>):
+<li>Mailing lists (also available at <a href="http://gmane.net">Gmane</a>):
<ul>
-<li>
-<a href="http://lists.sourceforge.net/lists/listinfo/emacs-jabber-general">emacs-jabber-general</a>, for posts by humans (also <a href="http://dir.gmane.org/gmane.emacs.jabber.general">gmane.emacs.jabber.general</a>)
+<li><a href="http://lists.sourceforge.net/lists/listinfo/emacs-jabber-general">emacs-jabber-general</a>, for posts by humans (also <a href="http://dir.gmane.org/gmane.emacs.jabber.general">gmane.emacs.jabber.general</a>)
</li>
-<li>
-<a href="http://lists.sourceforge.net/lists/listinfo/emacs-jabber-commit">emacs-jabber-commit</a>, read-only mailing list of CVS commits (also <a href="http://dir.gmane.org/gmane.emacs.jabber.scm">gmane.emacs.jabber.scm</a>)
+<li><a href="http://lists.sourceforge.net/lists/listinfo/emacs-jabber-commit">emacs-jabber-commit</a>, read-only mailing list of CVS commits (also <a href="http://dir.gmane.org/gmane.emacs.jabber.scm">gmane.emacs.jabber.scm</a>)
</li>
-<li>
-<a href="http://lists.sourceforge.net/lists/listinfo/emacs-jabber-bugs">emacs-jabber-bugs</a>, read-only mailing list of bug tracker activity (also <a href="http://dir.gmane.org/gmane.emacs.jabber.bugs">gmane.emacs.jabber.bugs</a>)
+<li><a href="http://lists.sourceforge.net/lists/listinfo/emacs-jabber-bugs">emacs-jabber-bugs</a>, read-only mailing list of bug tracker activity (also <a href="http://dir.gmane.org/gmane.emacs.jabber.bugs">gmane.emacs.jabber.bugs</a>)
</li>
</ul>
+
</li>
-<li>
-the Jabber chat room
-<a href="xmpp:jabber.el< at >conference.jabber.se?join">jabber.el< at >conference.jabber.se</a>
+<li>the Jabber chat room
</li>
-<li>
-the <a href="manual-0.8.0/">manual for jabber.el 0.8.0</a> (also included in the release files)
+</ul>
+
+<a href="xmpp:jabber.el< at >conference.jabber.se?join">jabber.el< at >conference.jabber.se</a>
+<ul>
+<li>the <a href="manual-0.8.0/">manual for jabber.el 0.8.0</a> (also included in the release files)
</li>
</ul>
+
+
<div id="outline-container-1" class="outline-2">
-<h2 id="sec-1">What is Jabber?</h2>
-<div id="text-1">
+<h2 id="sec-1">What is Jabber? </h2>
+<div class="outline-text-2" id="text-1">
<p>
Jabber is an open instant messaging (IM) system, also known as XMPP.
-It is described in <a href="http://www.xmpp.org/rfcs/">RFCs 3920-3923</a> and a series of <a href="http://www.xmpp.org/extensions/">XEPs</a> (XMPP Extension
+It is described in <a href="http://xmpp.org/xmpp-protocols/rfcs/">RFCs 3920-3923</a> and a series of <a href="http://xmpp.org/xmpp-protocols/xmpp-extensions/">XEPs</a> (XMPP Extension
Proposals). That is, unlike legacy IM systems (such as ICQ or MSN
Messenger), the protocol is published in the open, free for anyone to
implement. Therefore you shouldn't be surprised that there is a
Jabber client for Emacs, too. (If you are not of the Emacs
-persuasion, see this <a href="http://www.jabber.org/software/clients.shtml">list of Jabber clients</a>.)
+persuasion, see this <a href="http://xmpp.org/xmpp-software/clients/">list of XMPP/Jabber clients</a>.)
</p>
<p>
Jabber is, like e-mail, a decentralised system. A Jabber identifier
< at >< at > -169,8 +206,8 < at >< at >
</div>
<div id="outline-container-2" class="outline-2">
-<h2 id="sec-2">What is jabber.el?</h2>
-<div id="text-2">
+<h2 id="sec-2">What is jabber.el? </h2>
+<div class="outline-text-2" id="text-2">
<p>
< at >< at > -183,16 +220,16 < at >< at >
</div>
<div id="outline-container-3" class="outline-2">
-<h2 id="sec-3">Downloading and installing</h2>
-<div id="text-3">
+<h2 id="sec-3">Downloading and installing </h2>
+<div class="outline-text-2" id="text-3">
</div>
-<div id="outline-container-3.1" class="outline-3">
-<h3 id="sec-3.1">Prepackaged</h3>
-<div id="text-3.1">
+<div id="outline-container-3-1" class="outline-3">
+<h3 id="sec-3-1">Prepackaged </h3>
+<div class="outline-text-3" id="text-3-1">
<p>
< at >< at > -203,9 +240,9 < at >< at >
</div>
-<div id="outline-container-3.2" class="outline-3">
-<h3 id="sec-3.2">Dependencies</h3>
-<div id="text-3.2">
+<div id="outline-container-3-2" class="outline-3">
+<h3 id="sec-3-2">Dependencies </h3>
+<div class="outline-text-3" id="text-3-2">
<p>
< at >< at > -226,17 +263,19 < at >< at >
</div>
-<div id="outline-container-3.3" class="outline-3">
-<h3 id="sec-3.3">Downloading</h3>
-<div id="text-3.3">
+<div id="outline-container-3-3" class="outline-3">
+<h3 id="sec-3-3">Downloading </h3>
+<div class="outline-text-3" id="text-3-3">
<p>
Download the <a href="#impatient">latest release</a> and unpack it in a suitable location. Add
something like the following to your <code>.emacs</code> file:
</p>
-<pre class="example">
-;; adjust this path:
+
+
+
+<pre class="example">;; adjust this path:
(add-to-list 'load-path "/path/to/emacs-jabber")
;; For 0.7.1 and below:
(require 'jabber)
< at >< at > -244,6 +283,8 < at >< at >
(require 'jabber-autoloads)
</pre>
+
+
<p>
Either evaluate those lines, or restart Emacs.
</p>
< at >< at > -251,9 +292,9 < at >< at >
</div>
-<div id="outline-container-3.4" class="outline-3">
-<h3 id="sec-3.4">Using</h3>
-<div id="text-3.4">
+<div id="outline-container-3-4" class="outline-3">
+<h3 id="sec-3-4">Using </h3>
+<div class="outline-text-3" id="text-3-4">
<p>
< at >< at > -267,8 +308,8 < at >< at >
</div>
<div id="outline-container-4" class="outline-2">
-<h2 id="sec-4">Reporting bugs</h2>
-<div id="text-4">
+<h2 id="sec-4">Reporting bugs </h2>
+<div class="outline-text-2" id="text-4">
<p>
< at >< at > -281,8 +322,8 < at >< at >
</div>
<div id="outline-container-5" class="outline-2">
-<h2 id="sec-5">Latest source</h2>
-<div id="text-5">
+<h2 id="sec-5">Latest source </h2>
+<div class="outline-text-2" id="text-5">
<p>
< at >< at > -293,14 +334,18 < at >< at >
</div>
-<div id="outline-container-5.1" class="outline-3">
-<h3 id="sec-5.1">On Sourceforge</h3>
-<div id="text-5.1">
+<div id="outline-container-5-1" class="outline-3">
+<h3 id="sec-5-1">On Sourceforge </h3>
+<div class="outline-text-3" id="text-5-1">
-<pre class="example">
-git clone git://emacs-jabber.git.sourceforge.net/gitroot/emacs-jabber/emacs-jabber
+
+
+
+<pre class="example">git clone git://emacs-jabber.git.sourceforge.net/gitroot/emacs-jabber/emacs-jabber
</pre>
+
+
<p>
You can also <a href="http://emacs-jabber.git.sourceforge.net/">browse the repository</a> with your web browser.
</p>
< at >< at > -308,23 +353,27 < at >< at >
</div>
-<div id="outline-container-5.2" class="outline-3">
-<h3 id="sec-5.2">catap's repository</h3>
-<div id="text-5.2">
+<div id="outline-container-5-2" class="outline-3">
+<h3 id="sec-5-2">catap's repository </h3>
+<div class="outline-text-3" id="text-5-2">
-<pre class="example">
-git clone git://catap.ru/emacs-jabber/emacs-jabber.git
+
+
+
+<pre class="example">git clone git://catap.ru/emacs-jabber/emacs-jabber.git
</pre>
+
+
</div>
</div>
</div>
<div id="outline-container-6" class="outline-2">
-<h2 id="sec-6">List of releases</h2>
-<div id="text-6">
+<h2 id="sec-6">List of releases </h2>
+<div class="outline-text-2" id="text-6">
<p>
< at >< at > -332,7 +381,11 < at >< at >
</p>
</div>
</div>
-<div id="postamble"><p class="date"> Date: 2009-09-12 15:29:40 BST</p>
-<p>HTML generated by org-mode 6.13a in emacs 23</p>
-</div></body>
+<div id="postamble">
+<p class="date">Date: 2011-08-20 22:26:40 BST</p>
+<p class="creator">Org version 7.6 with Emacs version 24</p>
+<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
+</div>
+</div>
+</body>
</html>
Index: index.org
===================================================================
RCS file: /cvsroot/emacs-jabber/www/index.org,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- index.org12 Sep 2009 14:17:29 -00001.7
+++ index.org20 Aug 2011 21:38:34 -00001.8
< at >< at > -37,12 +37,12 < at >< at >
* What is Jabber?
Jabber is an open instant messaging (IM) system, also known as XMPP.
-It is described in [[http://www.xmpp.org/rfcs/][RFCs 3920-3923]] and a series of [[http://www.xmpp.org/extensions/][XEPs]] (XMPP Extension
+It is described in [[http://xmpp.org/xmpp-protocols/rfcs/][RFCs 3920-3923]] and a series of [[http://xmpp.org/xmpp-protocols/xmpp-extensions/][XEPs]] (XMPP Extension
Proposals). That is, unlike legacy IM systems (such as ICQ or MSN
Messenger), the protocol is published in the open, free for anyone to
implement. Therefore you shouldn't be surprised that there is a
Jabber client for Emacs, too. (If you are not of the Emacs
-persuasion, see this [[http://www.jabber.org/software/clients.shtml][list of Jabber clients]].)
+persuasion, see this [[http://xmpp.org/xmpp-software/clients/][list of XMPP/Jabber clients]].)
Jabber is, like e-mail, a decentralised system. A Jabber identifier
(JID) is of the form =username< at >server=, just like an e-mail address, and
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
</pre>
Magnus Henoch
2011-08-20T21:38:37
-
[SCM] emacs-jabber branch, namespace-prefixes,created. 3dd51cf94e3da967a4678ab3c13d78c10ef43c8d
http://comments.gmane.org/gmane.emacs.jabber.scm/352
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, namespace-prefixes has been created
at 3dd51cf94e3da967a4678ab3c13d78c10ef43c8d (commit)
- Log -----------------------------------------------------------------
commit 3dd51cf94e3da967a4678ab3c13d78c10ef43c8d
Author: Magnus Henoch <legoscia< at >users.sourceforge.net>
Date: Sat Aug 20 20:01:57 2011 +0100
First attempt at handling namespace prefixes
Google Talk just started using namespace prefixes, e.g.
<ros:query xmlns:ros="jabber:iq:roster">...
something that jabber.el is completely unprepared for.
This hack seems to restore status quo.
* jabber-xml.el (jabber-xml-resolve-namespace-prefixes): New function.
* jabber-core.el (jabber-filter): Call
jabber-xml-resolve-namespace-prefixes for every incoming stanza.
diff --git a/jabber-core.el b/jabber-core.el
index 084f25e..b2a1fa5 100644
--- a/jabber-core.el
+++ b/jabber-core.el
< at >< at > -911,7 +911,7 < at >< at > DATA is any sexp."
(sit-for 2)))
(delete-region (point-min) (point))
- (fsm-send fsm (list :stanza (car xml-data)))
+ (fsm-send fsm (list :stanza (jabber-xml-resolve-namespace-prefixes (car xml-data))))
;; XXX: move this logic elsewhere
;; We explicitly don't catch errors in jabber-process-input,
;; to facilitate debugging.
diff --git a/jabber-xml.el b/jabber-xml.el
index 878df60..88878fe 100644
--- a/jabber-xml.el
+++ b/jabber-xml.el
< at >< at > -21,6 +21,8 < at >< at >
(require 'xml)
(require 'jabber-util)
+(eval-when-compile
+ (require 'cl))
(defun jabber-escape-xml (str)
"escape strings for xml"
< at >< at > -221,6 +223,50 < at >< at > any string character data of this node"
,< at >body))
(put 'jabber-xml-let-attributes 'lisp-indent-function 2)
+(defun jabber-xml-resolve-namespace-prefixes (xml-data &optional default-ns prefixes)
+ (let ((node-name (jabber-xml-node-name xml-data))
+(attrs (jabber-xml-node-attributes xml-data)))
+ ;; First find any foo:xmlns attributes..
+ (dolist (attr attrs)
+ (let ((attr-name (symbol-name (car attr))))
+(when (string-match "xmlns:" attr-name)
+ (let ((prefix (substring attr-name (match-end 0)))
+(ns-uri (cdr attr)))
+ ;; A slightly complicated dance to never change the
+ ;; original value of prefixes (since the caller depends on
+ ;; it), but also to avoid excessive copying (which remove
+ ;; always does). Might need to profile and tweak this for
+ ;; performance.
+ (setq prefixes
+ (cons (cons prefix ns-uri)
+(if (assoc prefix prefixes)
+ (remove (assoc prefix prefixes) prefixes)
+ prefixes)))))))
+ ;; If there is an xmlns attribute, it is the new default
+ ;; namespace.
+ (let ((xmlns (jabber-xml-get-xmlns xml-data)))
+ (when xmlns
+(setq default-ns xmlns)))
+ ;; Now, if the node name has a prefix, replace it and add an
+ ;; "xmlns" attribute. Slightly ugly, but avoids the need to
+ ;; change all the rest of jabber.el at once.
+ (let ((node-name-string (symbol-name node-name)))
+ (when (string-match "\\(.*\\):\\(.*\\)" node-name-string)
+(let* ((prefix (match-string 1 node-name-string))
+ (unprefixed (match-string 2 node-name-string))
+ (ns (assoc prefix prefixes)))
+ (if (null ns)
+ ;; This is not supposed to happen...
+ (message "jabber-xml-resolve-namespace-prefixes: Unknown prefix in %s" node-name-string)
+ (setf (car xml-data) (intern unprefixed))
+ (setf (cadr xml-data) (cons (cons 'xmlns (cdr ns)) (delq 'xmlns attrs)))))))
+ ;; And iterate through all child elements.
+ (mapc (lambda (x)
+ (when (listp x)
+ (jabber-xml-resolve-namespace-prefixes x default-ns prefixes)))
+ (jabber-xml-node-children xml-data))
+ xml-data))
+
(provide 'jabber-xml)
;;; arch-tag: ca206e65-7026-4ee8-9af2-ff6a9c5af98a
-----------------------------------------------------------------------
hooks/post-receive
</pre>
Magnus Henoch
2011-08-20T19:04:49
-
[SCM] emacs-jabber branch, master,updated. d30ef9b989065f6e714cf1781bbd0e7e4039681c
http://comments.gmane.org/gmane.emacs.jabber.scm/351
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via d30ef9b989065f6e714cf1781bbd0e7e4039681c (commit)
from 10c065380f088e65d6ad81595b68ecd6f084c471 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d30ef9b989065f6e714cf1781bbd0e7e4039681c
Author: Evgenii Terechkov <evg< at >altlinux.org>
Date: Tue Oct 19 23:41:05 2010 +0800
Work around broken stanzas from some transports
diff --git a/jabber-muc.el b/jabber-muc.el
index d342905..d717bd9 100644
--- a/jabber-muc.el
+++ b/jabber-muc.el
< at >< at > -500,13 +500,17 < at >< at > groupchat buffer."
)
;; Maybe another error occurred. Report it to user
(condition
-(message "Couldn't query groupchat: %s" (jabber-parse-error result))))
+(message "Couldn't query groupchat: %s" (jabber-parse-error result)))
+
+ ;; Bad stanza? Without NS, for example
+ ((and (eq identities 'error) (not condition))
+ (message "Bad error stanza received")))
;; Continue only if it is really chat room. If there was an
;; error, give the chat room the benefit of the doubt. (Needed
;; for ejabberd's mod_irc, for example)
(when (or condition
- (find "conference" identities
+ (find "conference" (if (sequencep identities) identities nil)
:key (lambda (i) (aref i 1))
:test #'string=))
(let ((password
-----------------------------------------------------------------------
Summary of changes:
jabber-muc.el | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
</pre>
Evgenii Terechkov
2010-10-19T15:42:10
-
[SCM] emacs-jabber branch, master,updated. 10c065380f088e65d6ad81595b68ecd6f084c471
http://comments.gmane.org/gmane.emacs.jabber.scm/350
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 10c065380f088e65d6ad81595b68ecd6f084c471 (commit)
via 60e25ef3a92a7ebe4bba7bc0f260e61a8af595dd (commit)
via 583d31943d14f09e4364ca71d75e4ccc3bce7f7d (commit)
via 1f38235feae68176925656f824c056153d5c2d1f (commit)
from cab6d24734439307b52b375dd1290727ba573354 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 10c065380f088e65d6ad81595b68ecd6f084c471
Author: Evgenii Terechkov <evg< at >altlinux.org>
Date: Sat May 1 20:30:57 2010 +0800
Fix ELPA package creation
First, we don't know if it sha1/hex-util/hexrgb present on target
system, so install it anyway.
Second, add autoload cookie to normal loading of hexrgb.
diff --git a/Makefile.am b/Makefile.am
index 1044f06..4a9767f 100644
--- a/Makefile.am
+++ b/Makefile.am
< at >< at > -74,6 +74,7 < at >< at > elpa: dist
mv emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION)
cd jabber-$(PACKAGE_VERSION) ; install-info jabber.info dir
sed "s/< at >""PACKAGE_VERSION< at >""/$(PACKAGE_VERSION)/" < $(srcdir)/jabber-pkg.el.in > jabber-$(PACKAGE_VERSION)/jabber-pkg.el
+mv jabber-$(PACKAGE_VERSION)/compat/*.el jabber-$(PACKAGE_VERSION)/
$(AMTAR) chf jabber-$(PACKAGE_VERSION).tar jabber-$(PACKAGE_VERSION)
rm -rf jabber-$(PACKAGE_VERSION)
< at >echo "Created jabber-$(PACKAGE_VERSION).tar"
diff --git a/compat/hexrgb.el b/compat/hexrgb.el
index 925468c..57f2c2c 100644
--- a/compat/hexrgb.el
+++ b/compat/hexrgb.el
< at >< at > -167,6 +167,7 < at >< at >
;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;###autoload
(eval-and-compile
(defun hexrgb-canonicalize-defined-colors (list)
"Copy of LIST with color names canonicalized.
commit 60e25ef3a92a7ebe4bba7bc0f260e61a8af595dd
Author: Evgenii Terechkov <evg< at >altlinux.org>
Date: Wed Apr 28 17:03:14 2010 +0800
Ignore all errors in shell/dbus calls.
Dont show noise errors when emacs started from console session.
diff --git a/jabber-libnotify.el b/jabber-libnotify.el
index 02f4af1..bf4d44c 100644
--- a/jabber-libnotify.el
+++ b/jabber-libnotify.el
< at >< at > -91,7 +91,8 < at >< at >
':string (encode-coding-string body 'utf-8)
'(:array)
'(:array :signature "{sv}")
- ':int32 jabber-libnotify-timeout))))))
+ ':int32 jabber-libnotify-timeout)))
+ (error nil))))
(define-jabber-alert libnotify "Show a message through the libnotify interface"
'jabber-libnotify-message)
commit 583d31943d14f09e4364ca71d75e4ccc3bce7f7d
Author: Evgenii Terechkov <evg< at >altlinux.org>
Date: Mon Apr 26 15:34:13 2010 +0800
Suppres "Invalid timer" error when jabber-keepalive-timeout-timer is nil by some reason.
TBD: trace why jabber-keepalive-timeout-timer is nil sometimes.
diff --git a/jabber-keepalive.el b/jabber-keepalive.el
index d4f221f..7c424c1 100644
--- a/jabber-keepalive.el
+++ b/jabber-keepalive.el
< at >< at > -105,7 +105,7 < at >< at > for all accounts regardless of the argument."
(current-time-string)
(plist-get (fsm-get-state-data jc) :server)))
(setq jabber-keepalive-pending (remq jc jabber-keepalive-pending))
- (when (null jabber-keepalive-pending)
+ (when (and (null jabber-keepalive-pending) (timerp jabber-keepalive-timeout-timer))
(jabber-cancel-timer jabber-keepalive-timeout-timer)
(setq jabber-keepalive-timeout-timer nil)))
commit 1f38235feae68176925656f824c056153d5c2d1f
Author: Evgenii Terechkov <evg< at >altlinux.org>
Date: Thu Apr 22 15:12:16 2010 +0800
Dont save undo history in chat buffers.
diff --git a/jabber-chatbuffer.el b/jabber-chatbuffer.el
index 53bba3c..2ea9119 100644
--- a/jabber-chatbuffer.el
+++ b/jabber-chatbuffer.el
< at >< at > -55,7 +55,8 < at >< at > window or at `fill-column', whichever is shorter."
(make-local-variable 'scroll-conservatively)
(make-local-variable 'jabber-point-insert)
(make-local-variable 'jabber-chat-ewoc)
-
+ (make-local-variable 'buffer-undo-list)
+
(setq jabber-buffer-connection jc
scroll-conservatively 5
buffer-undo-list t) ;dont keep undo list for chatbuffer
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 +
compat/hexrgb.el | 1 +
jabber-chatbuffer.el | 3 ++-
jabber-keepalive.el | 2 +-
jabber-libnotify.el | 3 ++-
5 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
</pre>
Evgenii Terechkov
2010-10-19T15:36:24
-
[SCM] emacs-jabber branch, master,updated. cab6d24734439307b52b375dd1290727ba573354
http://comments.gmane.org/gmane.emacs.jabber.scm/349
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via cab6d24734439307b52b375dd1290727ba573354 (commit)
from c11374cb99bbf88c3019778bb7a41709e2901998 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cab6d24734439307b52b375dd1290727ba573354
Author: Evgenii Terechkov <evg< at >altlinux.org>
Date: Tue Oct 19 23:18:50 2010 +0800
Documentation patch from Valery V. Vorotyntsev
diff --git a/jabber.texi b/jabber.texi
index b4f7db5..d11533a 100644
--- a/jabber.texi
+++ b/jabber.texi
< at >< at > -42,26 +42,26 < at >< at > this permission notice are preserved on all copies.
< at >end ifnottex
< at >menu
-* Introduction::
-* Basic operation::
-* Groupchat::
-* Composing messages::
-* File transfer::
-* Services::
-* Personal information::
-* Avatars::
-* Time queries::
-* Useful features::
-* Message history::
-* Typing notifications::
-* Roster import and export::
-* XMPP URIs::
-* Customization::
-* Hacking and extending::
-* Protocol support::
-* Concept index::
-* Function index::
-* Variable index::
+* Introduction::
+* Basic operation::
+* Groupchat::
+* Composing messages::
+* File transfer::
+* Services::
+* Personal information::
+* Avatars::
+* Time queries::
+* Useful features::
+* Message history::
+* Typing notifications::
+* Roster import and export::
+* XMPP URIs::
+* Customization::
+* Hacking and extending::
+* Protocol support::
+* Concept index::
+* Function index::
+* Variable index::
< at >end menu
< at >< at > -84,11 +84,11 < at >< at > jabber.el does not yet support PGP encryption, sending and receiving
roster items, and various other things.
< at >menu
-* Contact::
+* Contacts::
< at >end menu
-< at >node Contact, , Introduction, Introduction
-< at >section Contact
+< at >node Contacts, , , Introduction
+< at >section Contacts
< at >itemize < at >bullet
< at >item
< at >< at > -131,16 +131,16 < at >< at > start with < at >kbd{C-x C-j}, and you can get a list of them by typing
< at >kbd{C-x C-j C-h}.
< at >menu
-* Do you have a Jabber account?::
-* Registering an account::
-* Connecting::
-* Chatting::
-* Presence::
-* Presence subscription::
-* Roster buffer::
+* Do you have a Jabber account?::
+* Registering an account::
+* Connecting::
+* Chatting::
+* Presence::
+* Presence subscription::
+* Roster buffer::
< at >end menu
-< at >node Do you have a Jabber account?, Registering an account, Basic operation, Basic operation
+< at >node Do you have a Jabber account?, Registering an account, , Basic operation
< at >section Do you have a Jabber account?
Jabber has become rather popular as an instant messaging technology.
< at >< at > -293,11 +293,11 < at >< at > presence that is sent, change the variables
With jabber.el, you can set your presence remotely. < at >xref{Ad-Hoc Commands}.
< at >menu
-* Resources and priority::
-* Directed presence::
+* Resources and priority::
+* Directed presence::
< at >end menu
-< at >node Resources and priority, Directed presence, Presence, Presence
+< at >node Resources and priority, Directed presence, , Presence
< at >subsection Resources and priority
< at >cindex Resource
< at >< at > -440,13 +440,13 < at >< at > shown here.
< at >findex jabber-muc-join
< at >cindex Joining a groupchat
< at >cindex Changing nickname
-< at >cindex Nickname, changing
+< at >cindex Nickname, changing
To join a groupchat, type < at >kbd{M-x jabber-muc-join}. You will
be prompted for the groupchat to join, and your nickname in the
groupchat. This nickname doesn't need to have any correlation to your
JID; in fact, groupchats are usually (but not always) configured such
that only moderators can see your JID. You can change your nickname
-with < at >kbd{M-x jabber-muc-nick}. < at >xref{Configuration}, for setting default
+with < at >kbd{M-x jabber-muc-nick}. < at >xref{Configuration}, for setting default
nicknames.
< at >cindex Query groupchat
< at >< at > -503,13 +503,13 < at >< at > jabber-muc-names}. This gives a list of nicknames,
< at >menu
-* Configuration::
-* Invitations::
-* Private messages::
-* MUC Administration::
+* Configuration::
+* Invitations::
+* Private messages::
+* MUC Administration::
< at >end menu
-< at >node Configuration, Invitations, Groupchat, Groupchat
+< at >node Configuration, Invitations, , Groupchat
< at >section Configuration
< at >vindex jabber-muc-default-nicknames
< at >< at > -686,11 +686,11 < at >< at > client. The Google Talk client uses a different file transfer protocol
which, at the time of this release, has not been published.
< at >menu
-* Receiving files::
-* Sending files::
+* Receiving files::
+* Sending files::
< at >end menu
-< at >node Receiving files, Sending files, File transfer, File transfer
+< at >node Receiving files, Sending files, , File transfer
< at >section Receiving files
Receiving files requires no configuration. When someone wants to send a
< at >< at > -779,14 +779,14 < at >< at > You can change the buffer name template by customizing
the variable < at >code{jabber-browse-buffer-format}.
< at >menu
-* Commands::
-* Your home server::
-* Transports::
-* User directories::
-* MUC services::
+* Commands::
+* Your home server::
+* Transports::
+* User directories::
+* MUC services::
< at >end menu
-< at >node Commands, Your home server, Services, Services
+< at >node Commands, Your home server, , Services
< at >section Commands
A small number of commands is used for almost all interaction with
< at >< at > -798,14 +798,14 < at >< at > opened by typing < at >kbd{C-c C-s}. Service discovery is under the Info
menu instead, which is available under < at >kbd{C-c C-i}.
< at >menu
-* Registration::
-* Search::
-* Ad-Hoc Commands::
-* Service discovery::
-* Browsing::
+* Registration::
+* Search::
+* Ad-Hoc Commands::
+* Service discovery::
+* Browsing::
< at >end menu
-< at >node Registration, Search, Commands, Commands
+< at >node Registration, Search, , Commands
< at >subsection Registration
< at >cindex Registration
< at >< at > -832,10 +832,6 < at >< at > jabber-get-search}. This gives you a single-stage form to fill in.
After you press the ``Submit'' button at the bottom, the search results
will be displayed in the same buffer.
-< at >menu
-* Ad-Hoc Commands::
-< at >end menu
-
< at >node Ad-Hoc Commands, Service discovery, Search, Commands
< at >subsection Ad-Hoc Commands
< at >< at > -1104,16 +1100,17 < at >< at > jabber.el includes a number of features meant to improve the user
interface and do other useful things.
< at >menu
-* Autoaway::
-* Modeline status::
-* Keepalive::
-* Reconnecting::
-* Tracking activity::
-* Watch buddies::
-* Spell checking::
+* Autoaway::
+* Modeline status::
+* Keepalive::
+* Reconnecting::
+* Tracking activity::
+* Watch buddies::
+* Spell checking::
+* Gmail notifications::
< at >end menu
-< at >node Autoaway, Modeline status, Useful features, Useful features
+< at >node Autoaway, Modeline status, , Useful features
< at >section Autoaway
< at >cindex autoaway
< at >< at > -1272,7 +1269,7 < at >< at > minibuffer).
jabber.el supports automatic reconnection to Jabber server(s) upon lost
connection. By default it is off. To turn on, customize
-the < at >code{jabber-auto-reconnect} variable.
+the < at >code{jabber-auto-reconnect} variable.
This is of limited use if you have to type your password every time
jabber.el reconnects. There are two ways to save your password: you can
< at >< at > -1345,7 +1342,7 < at >< at > online. jabber.el will remember this for the rest of your Emacs
session (it's not saved to disk, though), but if you want to get rid
of it, type < at >kbd{M-x jabber-watch-remove}.
-< at >node Spell checking, , Watch buddies, Useful features
+< at >node Spell checking, Gmail notifications, Watch buddies, Useful features
< at >section Spell checking
< at >cindex flyspell
< at >< at > -1359,6 +1356,52 < at >< at > what you receive or what you have already sent. You may want to add
For more information about Emacs spell checking, < at >pxref{Spelling, ,
Checking and Correcting Spelling, emacs, GNU Emacs Manual}.
+< at >node Gmail notifications, , Spell checking, Useful features
+< at >section Gmail notifications
+
+< at >cindex Gmail notifications
+
+If you are connected to a Google Talk account, you can receive
+notifications when a new Gmail message arrives. Gmail notifications
+are enabled by adding the following line to your < at >file{.emacs}:
+
+< at >example
+(add-hook 'jabber-post-connect-hooks 'jabber-gmail-subscribe)
+< at >end example
+
+Default behavior is to display a message that mentions the number of
+received gmails. You can customize this behavior by providing your
+own < at >code{jabber-gmail-dothreads} function.
+
+Example:
+
+< at >example
+(eval-after-load "jabber-gmail"
+ '(defun jabber-gmail-dothreads (threads)
+ "Process <mail-thread-info/> elements.
+THREADS is a list of XML sexps corresponding to <mail-thread-info/>
+elements.
+See http://code.google.com/apis/talk/jep_extensions/gmail.html#response"
+ (osd "gmail: %d" (length threads))))
+
+;;; It's usually a good idea to have a shortcut for querying GTalk server.
+(global-set-key (kbd "<f9> g") 'jabber-gmail-query)
+
+;;; The definition of `osd' function used by `jabber-gmail-dothreads'.
+;;; `osd_cat' is shipped with the X OSD library
+;;; [http://www.ignavus.net/software.html].
+(if (and (display-graphic-p) (file-executable-p "/usr/bin/osd_cat"))
+ (defun osd (fmt &rest args)
+ "Display message on X screen."
+ (let ((opts "-p bottom -A center -l 1 \
+-f '-adobe-helvetica-bold-r-*-*-24-*-*-*-*-*-iso10646-1'")
+ (msg (apply 'format (concat fmt "\n") args)))
+(start-process "osd" nil shell-file-name shell-command-switch
+ (format "echo %s | osd_cat %s"
+ (shell-quote-argument msg) opts))))
+ (defalias 'osd 'message))
+< at >end example
+
< at >node Message history, Typing notifications, Useful features, Top
< at >chapter Message history
< at >< at > -1633,16 +1676,16 < at >< at > this is Emacs. To open a customization buffer for jabber.el, type
< at >kbd{M-x jabber-customize}.
< at >menu
-* Account settings::
-* Menu::
-* Customizing the roster buffer::
-* Customizing the chat buffer::
-* Customizing alerts::
-* Hooks::
-* Debug options::
+* Account settings::
+* Menu::
+* Customizing the roster buffer::
+* Customizing the chat buffer::
+* Customizing alerts::
+* Hooks::
+* Debug options::
< at >end menu
-< at >node Account settings, Menu, Customization, Customization
+< at >node Account settings, Menu, , Customization
< at >section Account settings
< at >cindex Username
< at >< at > -1697,6 +1740,8 < at >< at > you also need to set
``network server'' to < at >kbd{talk.google.com} and ``connection type'' to
``legacy SSL''.
+See also < at >ref{Gmail notifications}.
+
< at >subsection Upgrade note
Previous versions of jabber.el had the variables < at >code{jabber-username},
< at >< at > -1921,7 +1966,7 < at >< at > same arguments as the corresponding hooks, except for that last
argument.
Alert hook contributions are very welcome. You can send them to the
-mailing list, or to the Sourceforge patch tracker.
+mailing list, or to the Sourceforge patch tracker. < at >xref{Contacts}.
Alert hooks are meant for optional UI things, that are subject to
varying user tastes, and that can be toggled by simply adding or
< at >< at > -1933,14 +1978,14 < at >< at > e.g. < at >code{jabber-message-hooks} vs < at >code{jabber-alert-message-hooks},
etc.
< at >menu
-* Standard alerts::
-* Presence alerts::
-* Message alerts::
-* MUC alerts::
-* Info alerts::
+* Standard alerts::
+* Presence alerts::
+* Message alerts::
+* MUC alerts::
+* Info alerts::
< at >end menu
-< at >node Standard alerts, Presence alerts, Customizing alerts, Customizing alerts
+< at >node Standard alerts, Presence alerts, , Customizing alerts
< at >subsection Standard alerts
< at >cindex Alerts
< at >< at > -2258,17 +2303,17 < at >< at > yourself and trying to figure it out, but as a guide on where to
look. Knowledge of Jabber protocols is assumed.
< at >menu
-* Connection object::
-* XML representation::
-* JID symbols::
-* Listening for new requests::
-* Sending new requests::
-* Extending service discovery::
-* Chat printers::
-* Stanza chains::
+* Connection object::
+* XML representation::
+* JID symbols::
+* Listening for new requests::
+* Sending new requests::
+* Extending service discovery::
+* Chat printers::
+* Stanza chains::
< at >end menu
-< at >node Connection object, XML representation, Hacking and extending, Hacking and extending
+< at >node Connection object, XML representation, , Hacking and extending
< at >section Connection object
< at >cindex connection object
< at >cindex account object
< at >< at > -2500,11 +2545,11 < at >< at > information.
< at >menu
-* Providing info::
-* Requesting info::
+* Providing info::
+* Requesting info::
< at >end menu
-< at >node Providing info, Requesting info, Extending service discovery, Extending service discovery
+< at >node Providing info, Requesting info, , Extending service discovery
< at >subsection Providing info
Your new IQ request handlers will likely want to advertise their
< at >< at > -2685,7 +2730,7 < at >< at > jabber.el.
* XEP-0245:: The /me Command
< at >end menu
-< at >node RFC 3920, RFC 3921, Protocol support, Protocol support
+< at >node RFC 3920, RFC 3921, , Protocol support
< at >section RFC 3920 (XMPP-CORE)
Most of RFC 3920 is supported, with the following exceptions.
-----------------------------------------------------------------------
Summary of changes:
jabber.texi | 241 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 143 insertions(+), 98 deletions(-)
hooks/post-receive
</pre>
Evgenii Terechkov
2010-10-19T15:21:34
Search Engine
Search the mailing list at Gmane
query
http://search.gmane.org/?group=$group=gmane.emacs.jabber.scm