Menu
▾
▴
emacs-jabber-commit — jabber.el commit messages
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(13) |
Jun
(3) |
Jul
(4) |
Aug
(30) |
Sep
(17) |
Oct
(2) |
Nov
(6) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(9) |
Feb
(30) |
Mar
(22) |
Apr
(23) |
May
(25) |
Jun
(25) |
Jul
(4) |
Aug
(21) |
Sep
(16) |
Oct
(44) |
Nov
(15) |
Dec
(3) |
| 2009 |
Jan
(9) |
Feb
(6) |
Mar
(2) |
Apr
(2) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(2) |
Oct
(3) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2012 |
Jan
|
Feb
(3) |
Mar
|
Apr
(3) |
May
(2) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
(3) |
Feb
(4) |
Mar
|
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(10) |
Dec
|
| 2014 |
Jan
(6) |
Feb
(2) |
Mar
|
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(2) |
Aug
(6) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
(2) |
| 2015 |
Jan
(1) |
Feb
(2) |
Mar
(2) |
Apr
(6) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Magnus H. <leg...@us...> - 2008-10-21 18:54:42
|
Update of /cvsroot/emacs-jabber/www/html In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12324/html Modified Files: index.html Log Message: Rearrange and extend "external resources" Index: index.html =================================================================== RCS file: /cvsroot/emacs-jabber/www/html/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.html 5 Oct 2008 01:03:04 -0000 1.3 +++ index.html 21 Oct 2008 18:54:32 -0000 1.4 @@ -99,10 +99,24 @@ <p>External resources:</p> <ul> -<li><a href="http://sourceforge.net/projects/emacs-jabber/">Sourceforge project page</a></li> +<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&group_id=88346&func=browse">bugs</a>, +<a href="http://sourceforge.net/tracker/?atid=586353&group_id=88346&func=browse">feature requests</a>, +<a href="http://sourceforge.net/tracker/?atid=586352&group_id=88346&func=browse">patches</a> and +<a href="http://sourceforge.net/tracker/?atid=586351&group_id=88346&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> +</ul></li> <li><a href="http://www.emacswiki.org/cgi-bin/wiki/JabberEl">the JabberEl page of EmacsWiki</a></li> -<li>the mailing list <a href="http://lists.sourceforge.net/lists/listinfo/emacs-jabber-general">emacs-jabber-general</a>; also available as <a href="http://dir.gmane.org/gmane.emacs.jabber.general">gmane.emacs.jabber.general</a> on <a href="http://gmane.org">Gmane</a></li> -<li>read-only mailing list of CVS commits <a href="http://lists.sourceforge.net/lists/listinfo/emacs-jabber-commit">emacs-jabber-commit</a>; also available as <a href="http://dir.gmane.org/gmane.emacs.jabber.scm">gmane.emacs.jabber.scm</a> on <a href="http://gmane.org">Gmane</a></li> +<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> +<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> +</ul></li> <li>the Jabber chat room <a href="xmpp:jab...@co...?join">jab...@co...</a>, and its <a href="http://www.jabber.se/muc-logs/jab...@co.../">logs</a></li> <li>the <a href="manual-0.7.1/">manual for jabber.el 0.7.1</a> (also included in the release files)</li> </ul> |
|
From: Magnus H. <leg...@us...> - 2008-10-21 18:10:00
|
Update of /cvsroot/emacs-jabber/www In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9759 Modified Files: setup.el Log Message: Require muse-html to publish the web page Index: setup.el =================================================================== RCS file: /cvsroot/emacs-jabber/www/setup.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- setup.el 8 Dec 2007 23:44:01 -0000 1.1 +++ setup.el 21 Oct 2008 18:09:48 -0000 1.2 @@ -1,4 +1,5 @@ ;; Muse setup for jabber.el WWW pages +(require 'muse-html) ;; Find the directory this file lives in... this should work, I think. (let ((dir (if load-file-name |
|
From: Magnus H. <leg...@us...> - 2008-10-17 16:10:42
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8385 Modified Files: jabber-tox.el Log Message: jingle-send-native-candidate: payload must be a list Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- jabber-tox.el 16 Oct 2008 22:22:28 -0000 1.18 +++ jabber-tox.el 17 Oct 2008 16:10:19 -0000 1.19 @@ -326,25 +326,25 @@ The CANDIDATE is a list of components, as provided by the NewNativeCandidate signal of Tox." (jingle-send-iq state-data "transport-info" - `(content - ((creator . "initiator") - (name . "foo")) - (transport - ((xmlns . ,jingle-ice-udp-ns)) - ,@(mapcar - (lambda (c) - `(candidate - ((component . ,(number-to-string (nth 1 c))) - ;; foundation? - ;; generation? - (ip . ,(nth 2 c)) - ;; network? - (port . ,(number-to-string (nth 3 c))) - (protocol . ,(nth 4 c)) - (priority . ,(nth 7 c)) - ;; how to translate type? - ))) - candidate))))) + `((content + ((creator . "initiator") + (name . "foo")) + (transport + ((xmlns . ,jingle-ice-udp-ns)) + ,@(mapcar + (lambda (c) + `(candidate + ((component . ,(number-to-string (nth 1 c))) + ;; foundation? + ;; generation? + (ip . ,(nth 2 c)) + ;; network? + (port . ,(number-to-string (nth 3 c))) + (protocol . ,(nth 4 c)) + (priority . ,(nth 7 c)) + ;; how to translate type? + ))) + candidate)))))) (add-to-list 'jabber-iq-set-xmlns-alist (cons jingle-ns 'jabber-jingle-incoming-iq)) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 22:22:34
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3393 Modified Files: jabber-tox.el Log Message: Rewrite codec querying Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- jabber-tox.el 16 Oct 2008 21:54:51 -0000 1.17 +++ jabber-tox.el 16 Oct 2008 22:22:28 -0000 1.18 @@ -234,45 +234,54 @@ (list nil state-data)) (t - ;; Tell tox what codecs the remote side supports - (dbus-call-method nil tox-name tox-session tox-session-interface - "SetRemoteCodecs" - 'ignore - '((array (struct int32 string byte uint32 uint32 (array (dict-entry string string))))) - (mapcar - (lambda (pt) - (jabber-xml-let-attributes - (id name clockrate channels) pt - (list id name 0 clockrate channels - (mapcar - (lambda (param) - (jabber-xml-let-attributes - (name value) param - (list name value))) - (jabber-xml-get-children pt 'parameter))))) - (plist-get state-data :payload-types))) + (let ((tox-session (plist-get state-data :tox-session))) + ;; Tell tox what codecs the remote side supports + (dbus-call-method + :session tox-name tox-session tox-session-interface + "SetRemoteCodecs" + ;;'((array (struct int32 string byte uint32 uint32 (array (dict-entry string string))))) + (mapcar + (lambda (pt) + (jabber-xml-let-attributes + (id name clockrate channels) pt + (list :struct + :int32 (string-to-number id) + :string name + :byte 0 + :uint32 clockrate + :uint32 channels + (cons + :array + (or + (mapcar + (lambda (param) + (jabber-xml-let-attributes + (name value) param + (list :dict-entry :string name :string value))) + (jabber-xml-get-children pt 'parameter)) + (list :signature "{ss}")))))) + payload-types)) - ;; Check if we have any codecs in common - (dbus-call-method nil tox-name tox-session tox-session-interface - "GetCodecIntersection" - (lexical-let ((jingle-fsm fsm)) - (lambda (dbus-fsm msg) - (ecase (dbus-message-type msg) - (:error - (fsm-send jingle-fsm - (cons :error - (dbus-error-to-string msg)))) - (:method-return - (fsm-send jingle-fsm - (cons :ok - (first (dbus-message-body-values msg))))))))) + ;; Check if we have any codecs in common + (let ((codec-intersection + (dbus-call-method + :session tox-name tox-session tox-session-interface + "GetCodecIntersection"))) + (setq state-data + (plist-put + state-data + :codec-intersection codec-intersection)) - ;; So, now we know that we stand a basic chance of fulfilling - ;; the request. Let's move on to PENDING. - ;; XXX: should we check codec intersection first? - (list :pending - (plist-put state-data :payload-types payload-types)) - )))))) + (if codec-intersection + ;; So, now we know that we stand a basic chance of fulfilling + ;; the request. Let's move on to PENDING. + (list :pending state-data) + + ;; Or, it might turn out that we don't have any codecs + ;; in common with our partner. + (jingle-send-iq state-data "session-terminate" + '(reason () (media-error))) + (list nil state-data)))))))))) (define-state jingle :wait-for-codec-intersection (fsm state-data event callback) @@ -335,7 +344,7 @@ (priority . ,(nth 7 c)) ;; how to translate type? ))) - components))))) + candidate))))) (add-to-list 'jabber-iq-set-xmlns-alist (cons jingle-ns 'jabber-jingle-incoming-iq)) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 21:55:06
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31719 Modified Files: jabber-tox.el Log Message: Refactor: remove :allocate state Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- jabber-tox.el 16 Oct 2008 18:35:31 -0000 1.16 +++ jabber-tox.el 16 Oct 2008 21:54:51 -0000 1.17 @@ -57,13 +57,20 @@ SID is a string, the session ID. ROLE is either :initiator or :target. JID is the full JID of the partner." - (list :allocate - (list :jc jc :jid jid :sid sid :role role)))) + (let ((state-data (list :jc jc :jid jid :sid sid :role role))) + (setq state-data (jingle-create-tox-session fsm state-data)) + (list + (ecase (plist-get state-data :role) + (:initiator + :initiate) + (:target + :wait-for-initiate)) + state-data)))) -(define-enter-state jingle :allocate - (fsm state-data) - (condition-case e - ;; Allocate a ToxSession object. +(defun jingle-create-tox-session (fsm state-data) + "Helper function to create a Tox session. +Accepts, modifies, and returns STATE-DATA." + ;; XXX: should this always be bidirectional? (let* ((tox-session (dbus-call-method :session tox-name tox-path tox-interface "CreateSession" @@ -105,24 +112,7 @@ fsm (cons :new-native-candidate components))))) (fsm-debug-output "Waiting") - (list state-data nil)) - (error - ;; So, we couldn't initiate our Jingle tool. - (setq state-data (plist-put state-data :we-deserve-to-die (error-message-string e))) - ;; Make sure we exit gracefully. - (ecase (plist-get state-data :role) - (:initiator - ;; If we're the initiator, make sure that the user gets to know - ;; what happened. - (message "Couldn't initiate Jingle session: %s" - (error-message-string e)) - ;; This seems to be the smoothest way to get rid of the FSM... - (list state-data 0.1)) - (:target - ;; If we're the target, make sure that our contact gets to know - ;; what happened. We don't know yet how, but we will soon get - ;; an :iq-set that we need to answer. - (list state-data)))))) + state-data)) (define-enter-state jingle nil (fsm state-data) @@ -137,48 +127,6 @@ jingle-acct-sid-map) (list nil nil)) -(define-state jingle :allocate - (fsm state-data event callback) - (case (or (car-safe event) event) - (:new-native-candidate - (setq state-data (plist-put state-data :native-candidates (list (cdr event)))) - (list (ecase (plist-get state-data :role) - (:initiator - :initiate) - (:target - :wait-for-initiate)) - state-data)) - - (:native-candidates-prepared - ;; this code is currently unnecessary, as we never get the - ;; native-candidates-prepared signal - (let ((components (cdr event))) - (fsm-debug-output "The native candidates are %S" components) - (setq state-data (plist-put state-data :native-candidates components)) - (list (ecase (plist-get state-data :role) - (:initiator - :initiate) - (:target - :wait-for-initiate)) - state-data))) - - (:iq-set - (if (plist-get state-data :we-deserve-to-die) - (let ((iq (cdr event))) - (jabber-xml-let-attributes (from id) iq - (jabber-send-iq-error - (plist-get state-data :jc) - from id (jabber-iq-query iq) - "wait" 'internal-server-error - (plist-get state-data :we-deserve-to-die))) - (list nil state-data)) - :defer)) - - (:timeout - ;; fatal error during initialization, but we couldn't garbage - ;; collect ourselves until now. - (list nil state-data)))) - (define-enter-state jingle :initiate (fsm state-data) (let ((jc (plist-get state-data :jc)) @@ -237,7 +185,13 @@ (:iq-error (message "Couldn't initiate Jingle audio session: %s" (jabber-parse-error (jabber-iq-error (cdr event)))) - (list nil state-data)))) + (list nil state-data)) + (:new-native-candidate + (let ((components (cdr event))) + ;; XXX: keep them all + (setq state-data (plist-put state-data :native-candidates (list (cdr event)))) + (jingle-send-native-candidate state-data components) + (list :initiate state-data))))) (define-state jingle :wait-for-initiate (fsm state-data event callback) @@ -280,9 +234,27 @@ (list nil state-data)) (t - ;; Allocate a new ToxSession object. - (dbus-call-method nil tox-name tox-path tox-interface - "CreateSession" + ;; Tell tox what codecs the remote side supports + (dbus-call-method nil tox-name tox-session tox-session-interface + "SetRemoteCodecs" + 'ignore + '((array (struct int32 string byte uint32 uint32 (array (dict-entry string string))))) + (mapcar + (lambda (pt) + (jabber-xml-let-attributes + (id name clockrate channels) pt + (list id name 0 clockrate channels + (mapcar + (lambda (param) + (jabber-xml-let-attributes + (name value) param + (list name value))) + (jabber-xml-get-children pt 'parameter))))) + (plist-get state-data :payload-types))) + + ;; Check if we have any codecs in common + (dbus-call-method nil tox-name tox-session tox-session-interface + "GetCodecIntersection" (lexical-let ((jingle-fsm fsm)) (lambda (dbus-fsm msg) (ecase (dbus-message-type msg) @@ -293,65 +265,14 @@ (:method-return (fsm-send jingle-fsm (cons :ok - (first (dbus-message-body-values msg)))))))) - 'byte 3) - - (list :tox-wait (plist-put - (plist-put state-data :iq-id id) - :payload-types payload-types)))))))) - -(define-state jingle :tox-wait - (fsm state-data event callback) - ;; Wait for our ToxSession to be allocated - (case (car-safe event) - (:error - ;; Some error occurred. Bail out. - (let ((jc (plist-get state-data :jc)) - (jid (plist-get state-data :jid)) - (id (plist-get state-data :iq-id))) - (jabber-send-iq-error jc jid id nil "wait" 'internal-server-error (cdr event)) - - (list nil state-data))) - - (:ok - ;; ToxSession created. - (let ((tox-session (cdr event))) - (setq state-data (plist-put state-data :tox-session tox-session)) - - ;; Tell tox what codecs the remote side supports - (dbus-call-method nil tox-name tox-session tox-session-interface - "SetRemoteCodecs" - 'ignore - '((array (struct int32 string byte uint32 uint32 (array (dict-entry string string))))) - (mapcar - (lambda (pt) - (jabber-xml-let-attributes - (id name clockrate channels) pt - (list id name 0 clockrate channels - (mapcar - (lambda (param) - (jabber-xml-let-attributes - (name value) param - (list name value))) - (jabber-xml-get-children pt 'parameter))))) - (plist-get state-data :payload-types))) - - ;; Check if we have any codecs in common - (dbus-call-method nil tox-name tox-session tox-session-interface - "GetCodecIntersection" - (lexical-let ((jingle-fsm fsm)) - (lambda (dbus-fsm msg) - (ecase (dbus-message-type msg) - (:error - (fsm-send jingle-fsm - (cons :error - (dbus-error-to-string msg)))) - (:method-return - (fsm-send jingle-fsm - (cons :ok (first (dbus-message-body-values msg))))))))) - (list :wait-for-codec-intersection state-data))))) + ;; So, now we know that we stand a basic chance of fulfilling + ;; the request. Let's move on to PENDING. + ;; XXX: should we check codec intersection first? + (list :pending + (plist-put state-data :payload-types payload-types)) + )))))) (define-state jingle :wait-for-codec-intersection (fsm state-data event callback) @@ -391,6 +312,31 @@ ;; went offline. nil nil nil nil))) +(defun jingle-send-native-candidate (state-data candidate) + "Send a native candidate for ICE-UDP. +The CANDIDATE is a list of components, as provided by the +NewNativeCandidate signal of Tox." + (jingle-send-iq state-data "transport-info" + `(content + ((creator . "initiator") + (name . "foo")) + (transport + ((xmlns . ,jingle-ice-udp-ns)) + ,@(mapcar + (lambda (c) + `(candidate + ((component . ,(number-to-string (nth 1 c))) + ;; foundation? + ;; generation? + (ip . ,(nth 2 c)) + ;; network? + (port . ,(number-to-string (nth 3 c))) + (protocol . ,(nth 4 c)) + (priority . ,(nth 7 c)) + ;; how to translate type? + ))) + components))))) + (add-to-list 'jabber-iq-set-xmlns-alist (cons jingle-ns 'jabber-jingle-incoming-iq)) (defun jabber-jingle-incoming-iq (jc iq) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 21:39:09
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30219 Modified Files: README Log Message: Mention NewNativeCandidate in README Index: README =================================================================== RCS file: /cvsroot/emacs-jabber/tox/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README 17 Jan 2008 00:54:16 -0000 1.2 +++ README 16 Oct 2008 21:39:04 -0000 1.3 @@ -64,6 +64,11 @@ - Username (may be empty) - Password (may be empty) +signal NewNativeCandidate(array components) + + Signalled when a new local candidate has been determined. The + argument is the same as to AddRemoteCandidate. + signal NativeCandidatesPrepared(array components) Signalled when the local candidates have been determined, and are |
|
From: Magnus H. <leg...@us...> - 2008-10-16 18:35:53
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12485 Modified Files: jabber-tox.el Log Message: Don't try to start if we get bad errors during startup Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- jabber-tox.el 16 Oct 2008 18:15:31 -0000 1.15 +++ jabber-tox.el 16 Oct 2008 18:35:31 -0000 1.16 @@ -62,6 +62,7 @@ (define-enter-state jingle :allocate (fsm state-data) + (condition-case e ;; Allocate a ToxSession object. (let* ((tox-session (dbus-call-method :session tox-name tox-path tox-interface @@ -104,7 +105,24 @@ fsm (cons :new-native-candidate components))))) (fsm-debug-output "Waiting") - (list state-data nil))) + (list state-data nil)) + (error + ;; So, we couldn't initiate our Jingle tool. + (setq state-data (plist-put state-data :we-deserve-to-die (error-message-string e))) + ;; Make sure we exit gracefully. + (ecase (plist-get state-data :role) + (:initiator + ;; If we're the initiator, make sure that the user gets to know + ;; what happened. + (message "Couldn't initiate Jingle session: %s" + (error-message-string e)) + ;; This seems to be the smoothest way to get rid of the FSM... + (list state-data 0.1)) + (:target + ;; If we're the target, make sure that our contact gets to know + ;; what happened. We don't know yet how, but we will soon get + ;; an :iq-set that we need to answer. + (list state-data)))))) (define-enter-state jingle nil (fsm state-data) @@ -121,7 +139,7 @@ (define-state jingle :allocate (fsm state-data event callback) - (case (car-safe event) + (case (or (car-safe event) event) (:new-native-candidate (setq state-data (plist-put state-data :native-candidates (list (cdr event)))) (list (ecase (plist-get state-data :role) @@ -138,14 +156,28 @@ (fsm-debug-output "The native candidates are %S" components) (setq state-data (plist-put state-data :native-candidates components)) (list (ecase (plist-get state-data :role) - (:initiator - :initiate) - (:target - :wait-for-initiate)) + (:initiator + :initiate) + (:target + :wait-for-initiate)) state-data))) (:iq-set - :defer))) + (if (plist-get state-data :we-deserve-to-die) + (let ((iq (cdr event))) + (jabber-xml-let-attributes (from id) iq + (jabber-send-iq-error + (plist-get state-data :jc) + from id (jabber-iq-query iq) + "wait" 'internal-server-error + (plist-get state-data :we-deserve-to-die))) + (list nil state-data)) + :defer)) + + (:timeout + ;; fatal error during initialization, but we couldn't garbage + ;; collect ourselves until now. + (list nil state-data)))) (define-enter-state jingle :initiate (fsm state-data) @@ -371,7 +403,12 @@ (fsm (fsm-send-sync fsm (cons :iq-set iq))) ((string= action "session-initiate") - (setq fsm (start-jingle jc sid :target (jabber-xml-get-attribute iq 'from))) + (condition-case e + (setq fsm (start-jingle jc sid :target (jabber-xml-get-attribute iq 'from))) + (error + (jabber-signal-error "wait" 'internal-server-error + (concat "Couldn't accept Jingle session: " + (error-message-string e))))) (puthash (cons (jabber-connection-jid jc) sid) fsm jingle-acct-sid-map) (fsm-send-sync fsm (cons :iq-set iq))) (t |
|
From: Magnus H. <leg...@us...> - 2008-10-16 18:15:52
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11263 Modified Files: jabber-tox.el Log Message: Alter state-data at _beginning_ of :allocate enter function Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- jabber-tox.el 16 Oct 2008 18:12:15 -0000 1.14 +++ jabber-tox.el 16 Oct 2008 18:15:31 -0000 1.15 @@ -71,6 +71,9 @@ (our-codecs (dbus-call-method :session tox-name tox-session tox-session-interface "GetLocalCodecs"))) + (setq state-data (plist-put state-data :tox-session tox-session)) + (setq state-data (plist-put state-data :our-codecs our-codecs)) + (fsm-debug-output "tox-session: %S, our-codecs: %S" tox-session our-codecs) ;; Set up the pipeline, so we can search for transport candidates. (fsm-debug-output "About to call SetDefaultAudioSink") @@ -101,12 +104,7 @@ fsm (cons :new-native-candidate components))))) (fsm-debug-output "Waiting") - (list (plist-put - (plist-put - state-data - :tox-session tox-session) - :our-codecs our-codecs) - nil))) + (list state-data nil))) (define-enter-state jingle nil (fsm state-data) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 18:14:57
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10917 Modified Files: jabber-tox.el Log Message: "Refactor" generation of payload-type elements Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- jabber-tox.el 16 Oct 2008 18:10:30 -0000 1.13 +++ jabber-tox.el 16 Oct 2008 18:12:15 -0000 1.14 @@ -153,7 +153,28 @@ (fsm state-data) (let ((jc (plist-get state-data :jc)) (jid (plist-get state-data :jid)) - (sid (plist-get state-data :sid))) + (sid (plist-get state-data :sid)) + (payload-types (mapcar + (lambda (codec) + `(payload-type + ((id . ,(number-to-string (nth 0 codec))) + (name . ,(nth 1 codec)) + ;; (nth 2 codec) is media type; + ;; should we filter out + ;; non-audio codecs? then + ;; again, the value seems to be + ;; bogus... + (clockrate . ,(number-to-string (nth 3 codec))) + ,@(let ((channels (nth 4 codec))) + (unless (= channels 0) + `((channels . ,(number-to-string channels)))))) + ,@(mapcar + (lambda (param) + `(parameter + ((name . ,(nth 0 param)) + (value . ,(nth 1 param))))) + (nth 5 codec)))) + (plist-get state-data :our-codecs)))) (jabber-send-iq jc jid "set" `(jingle ((xmlns . ,jingle-ns) (action . "session-initiate") @@ -166,27 +187,7 @@ (description ((xmlns . ,jingle-rtp-ns) (media . "audio")) - ,@(mapcar - (lambda (codec) - `(payload-type - ((id . ,(number-to-string (nth 0 codec))) - (name . ,(nth 1 codec)) - ;; (nth 2 codec) is media type; - ;; should we filter out - ;; non-audio codecs? then - ;; again, the value seems to be - ;; bogus... - (clockrate . ,(number-to-string (nth 3 codec))) - ,@(let ((channels (nth 4 codec))) - (unless (= channels 0) - `((channels . ,(number-to-string channels)))))) - ,@(mapcar - (lambda (param) - `(parameter - ((name . ,(nth 0 param)) - (value . ,(nth 1 param))))) - (nth 5 codec)))) - (plist-get state-data :our-codecs))) + ,@payload-types) (transport ((xmlns . ,jingle-ice-udp-ns))))) (lambda (jc iq fsm) (fsm-send-sync fsm (cons :iq-result iq))) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 18:10:43
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10829 Modified Files: jabber-tox.el Log Message: Add jingle-send-iq function. Correct rejection because of unsupported applications/transports. Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- jabber-tox.el 16 Oct 2008 17:55:45 -0000 1.12 +++ jabber-tox.el 16 Oct 2008 18:10:30 -0000 1.13 @@ -224,16 +224,19 @@ :test 'string= :key 'jabber-xml-get-xmlns)) (payload-types (jabber-xml-get-children audio-content 'payload-type))) + ;; There are very few reasons for which we should not send an + ;; acknowledgement here; see section 6.3.2 of XEP-0166. + ;; Notably, we might want to check that there is a presence + ;; subscription. + (jabber-send-iq jc from "result" () + nil nil nil nil id) + (cond ;; Make sure audio is in the list of contents. We can ;; negotiate away other content types later. ((null audio-content) - (jabber-send-iq-error jc from id - jingle - "cancel" - 'feature-not-implemented - nil - `((unsupported-content ((xmlns . ,jingle-error-ns))))) + (jingle-send-iq state-data "session-terminate" + '(reason () (unsupported-applications))) (list nil state-data)) ;; Make sure ICE is in the list of transports. @@ -241,12 +244,8 @@ (jabber-xml-get-children content 'transport) :test 'string= :key 'jabber-xml-get-xmlns)) - (jabber-send-iq-error jc from id - jingle - "cancel" - 'feature-not-implemented - nil - `((unsupported-transports ((xmlns . ,jingle-error-ns))))) + (jingle-send-iq state-data "session-terminate" + '(reason () (unsupported-transports))) (list nil state-data)) (t @@ -333,6 +332,34 @@ ) +(defun jingle-send-iq (state-data action payload) + "Send a Jingle IQ stanza from within a Jingle FSM. +STATE-DATA is the state data plist of the FSM. +ACTION is the value of the action attribute of the <jingle/> +element. +PAYLOAD is a list of XML elements to include as children +of the <jingle/> element. +The recipient and the SID are determined from STATE-DATA." + (let ((jc (plist-get state-data :jc)) + (jid (plist-get state-data :jid)) + (role (plist-get state-data :role)) + (sid (plist-get state-data :sid))) + (jabber-send-iq + jc jid "set" + `(jingle ((xmlns . ,jingle-ns) + (action . ,action) + (initiator + . ,(ecase role + (:initiator + (jabber-connection-jid jc)) + (:target + jid))) + (sid . ,sid)) + ,@payload) + ;; XXX: we probably want error checking, to see if our partner + ;; went offline. + nil nil nil nil))) + (add-to-list 'jabber-iq-set-xmlns-alist (cons jingle-ns 'jabber-jingle-incoming-iq)) (defun jabber-jingle-incoming-iq (jc iq) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 17:55:53
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9748 Modified Files: jabber-tox.el Log Message: Remove session when finished Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- jabber-tox.el 16 Oct 2008 17:51:28 -0000 1.11 +++ jabber-tox.el 16 Oct 2008 17:55:45 -0000 1.12 @@ -116,6 +116,9 @@ (ignore-errors (dbus-call-method :session tox-name tox-session tox-session-interface "Destroy")))) + (remhash (cons (jabber-connection-jid (plist-get state-data :jc)) + (plist-get state-data :sid)) + jingle-acct-sid-map) (list nil nil)) (define-state jingle :allocate |
|
From: Magnus H. <leg...@us...> - 2008-10-16 17:51:39
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9582 Modified Files: jabber-tox.el Log Message: Update "unknown session" error Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- jabber-tox.el 16 Oct 2008 16:29:18 -0000 1.10 +++ jabber-tox.el 16 Oct 2008 17:51:28 -0000 1.11 @@ -346,8 +346,9 @@ (puthash (cons (jabber-connection-jid jc) sid) fsm jingle-acct-sid-map) (fsm-send-sync fsm (cons :iq-set iq))) (t - (jabber-signal-error "modify" 'unexpected-request - (format "Session \"%s\" unknown" sid))))))) + (jabber-signal-error "modify" 'bad-request + (format "Session \"%s\" unknown" sid) + `((unknown-session ((xmlns . ,jingle-error-ns)))))))))) (defun jabber-jingle-start-audio-session (jc jid) (interactive |
|
From: Magnus H. <leg...@us...> - 2008-10-16 16:29:36
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3959 Modified Files: jabber-tox.el Log Message: Check for transports at the right place Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- jabber-tox.el 16 Oct 2008 16:28:37 -0000 1.9 +++ jabber-tox.el 16 Oct 2008 16:29:18 -0000 1.10 @@ -235,7 +235,7 @@ ;; Make sure ICE is in the list of transports. ((not (member* jingle-ice-udp-ns - (jabber-xml-get-children audio-content 'transport) + (jabber-xml-get-children content 'transport) :test 'string= :key 'jabber-xml-get-xmlns)) (jabber-send-iq-error jc from id |
|
From: Magnus H. <leg...@us...> - 2008-10-16 16:28:48
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3915 Modified Files: jabber-tox.el Log Message: s/contents/content/, to be truthful Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- jabber-tox.el 16 Oct 2008 16:24:08 -0000 1.8 +++ jabber-tox.el 16 Oct 2008 16:28:37 -0000 1.9 @@ -214,9 +214,10 @@ (from (jabber-xml-get-attribute iq 'from)) (id (jabber-xml-get-attribute iq 'id)) (jingle (jabber-iq-query iq)) - (contents (car (jabber-xml-get-children jingle 'content))) + ;; XXX: could be more than one... + (content (car (jabber-xml-get-children jingle 'content))) ;; XXX: is it really audio? - (audio-content (find jingle-rtp-ns (jabber-xml-node-children contents) + (audio-content (find jingle-rtp-ns (jabber-xml-node-children content) :test 'string= :key 'jabber-xml-get-xmlns)) (payload-types (jabber-xml-get-children audio-content 'payload-type))) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 16:24:19
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3652 Modified Files: jabber-tox.el Log Message: Send content description in session-initiate Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- jabber-tox.el 16 Oct 2008 15:56:56 -0000 1.7 +++ jabber-tox.el 16 Oct 2008 16:24:08 -0000 1.8 @@ -157,10 +157,33 @@ (initiator . ,(jabber-connection-jid jc)) (sid . ,sid)) (content - ;; XXX: don't we need a content description here? read the specs... - ((creator . ,(jabber-connection-bare-jid jc)) + ((creator . "initiator") (name . "foo") (senders . "initiator")) + (description + ((xmlns . ,jingle-rtp-ns) + (media . "audio")) + ,@(mapcar + (lambda (codec) + `(payload-type + ((id . ,(number-to-string (nth 0 codec))) + (name . ,(nth 1 codec)) + ;; (nth 2 codec) is media type; + ;; should we filter out + ;; non-audio codecs? then + ;; again, the value seems to be + ;; bogus... + (clockrate . ,(number-to-string (nth 3 codec))) + ,@(let ((channels (nth 4 codec))) + (unless (= channels 0) + `((channels . ,(number-to-string channels)))))) + ,@(mapcar + (lambda (param) + `(parameter + ((name . ,(nth 0 param)) + (value . ,(nth 1 param))))) + (nth 5 codec)))) + (plist-get state-data :our-codecs))) (transport ((xmlns . ,jingle-ice-udp-ns))))) (lambda (jc iq fsm) (fsm-send-sync fsm (cons :iq-result iq))) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 16:13:23
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2818 Modified Files: tox-session.c Log Message: Note bogosity in codec struct Index: tox-session.c =================================================================== RCS file: /cvsroot/emacs-jabber/tox/tox-session.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- tox-session.c 20 Mar 2008 12:19:23 -0000 1.2 +++ tox-session.c 16 Oct 2008 16:13:02 -0000 1.3 @@ -457,6 +457,7 @@ g_value_array_append(codec_struct, &value); g_value_unset(&value); + /* XXX: why is this the same as id? */ g_value_init(&value, G_TYPE_UCHAR); g_value_set_uchar(&value, codec->media_type); g_value_array_append(codec_struct, &value); |
|
From: Magnus H. <leg...@us...> - 2008-10-16 15:57:22
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1571 Modified Files: jabber-tox.el Log Message: Update namespaces Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- jabber-tox.el 16 Oct 2008 15:50:24 -0000 1.6 +++ jabber-tox.el 16 Oct 2008 15:56:56 -0000 1.7 @@ -22,21 +22,18 @@ (require 'fsm) (require 'cl) -(defconst jingle-ns "http://www.xmpp.org/extensions/xep-0166.html#ns" +(defconst jingle-ns "urn:xmpp:jingle:0" "Jingle namespace (XEP-0166)") -(defconst jingle-error-ns "http://www.xmpp.org/extensions/xep-0166.html#ns-errors" +(defconst jingle-error-ns "urn:xmpp:jingle:errors:0" "Jingle error namespace (XEP-0166)") -(defconst jingle-audio-ns "http://www.xmpp.org/extensions/xep-0167.html#ns" - "Jingle Audio namespace (XEP-0167)") +(defconst jingle-rtp-ns "urn:xmpp:jingle:apps:rtp:0" + "Jingle RTP Sessions namespace (XEP-0167)") -(defconst jingle-ice-udp-ns "http://www.xmpp.org/extensions/xep-0176.html#ns-udp" +(defconst jingle-ice-udp-ns "urn:xmpp:jingle:transports:ice-udp:0" "Jingle ICE namespace (XEP-0176)") -(defconst jingle-udp-ns "http://www.xmpp.org/extensions/xep-0177.html" - "Jingle Raw UDP namespace (XEP-0177)") - (defvar jingle-acct-sid-map (make-hash-table :test 'equal) "Mapping from pairs of JIDs and Jingle SIDs to FSMs. The JID is the full JID of the account using the session.") @@ -195,7 +192,8 @@ (id (jabber-xml-get-attribute iq 'id)) (jingle (jabber-iq-query iq)) (contents (car (jabber-xml-get-children jingle 'content))) - (audio-content (find jingle-audio-ns (jabber-xml-node-children contents) + ;; XXX: is it really audio? + (audio-content (find jingle-rtp-ns (jabber-xml-node-children contents) :test 'string= :key 'jabber-xml-get-xmlns)) (payload-types (jabber-xml-get-children audio-content 'payload-type))) |
|
From: Magnus H. <leg...@us...> - 2008-10-16 15:50:39
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1114 Modified Files: jabber-tox.el Log Message: Note possibility for enhancement Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- jabber-tox.el 6 Oct 2008 23:11:00 -0000 1.5 +++ jabber-tox.el 16 Oct 2008 15:50:24 -0000 1.6 @@ -160,6 +160,7 @@ (initiator . ,(jabber-connection-jid jc)) (sid . ,sid)) (content + ;; XXX: don't we need a content description here? read the specs... ((creator . ,(jabber-connection-bare-jid jc)) (name . "foo") (senders . "initiator")) |
|
From: Magnus H. <leg...@us...> - 2008-10-06 23:16:56
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6315 Modified Files: main.c Log Message: debug messages about D-Bus name acquisition Index: main.c =================================================================== RCS file: /cvsroot/emacs-jabber/tox/main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- main.c 17 Jan 2008 00:45:21 -0000 1.1 +++ main.c 6 Oct 2008 23:14:14 -0000 1.2 @@ -39,6 +39,7 @@ "/org/freedesktop/DBus", "org.freedesktop.DBus"); + g_debug("About to request D-Bus name...\n"); if (!dbus_g_proxy_call(bus_proxy, "RequestName", &error, G_TYPE_STRING, "net.sourceforge.emacs-jabber.Tox", G_TYPE_UINT, @@ -57,6 +58,7 @@ g_printerr("Couldn't acquire name: RequestName returned %u\n", x); exit(1); } + g_debug("D-Bus name acquired\n"); obj = g_object_new(TOX_TYPE_OBJECT, "dbus-connection", connection, NULL); dbus_g_connection_register_g_object(connection, "/net/sourceforge/emacs_jabber/Tox", G_OBJECT(obj)); |
|
From: Magnus H. <leg...@us...> - 2008-10-06 23:15:34
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6097 Modified Files: jabber-tox.el Log Message: Actually put the SID into the FSM state data Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- jabber-tox.el 6 Oct 2008 22:57:19 -0000 1.4 +++ jabber-tox.el 6 Oct 2008 23:11:00 -0000 1.5 @@ -61,7 +61,7 @@ ROLE is either :initiator or :target. JID is the full JID of the partner." (list :allocate - (list :jc jc :jid jid :role role)))) + (list :jc jc :jid jid :sid sid :role role)))) (define-enter-state jingle :allocate (fsm state-data) |
|
From: Magnus H. <leg...@us...> - 2008-10-06 22:57:26
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5140 Modified Files: jabber-tox.el Log Message: Go to :wait-for-initiate instead of :initiate if we are the target Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- jabber-tox.el 6 Oct 2008 22:55:23 -0000 1.3 +++ jabber-tox.el 6 Oct 2008 22:57:19 -0000 1.4 @@ -126,7 +126,12 @@ (case (car-safe event) (:new-native-candidate (setq state-data (plist-put state-data :native-candidates (list (cdr event)))) - (list :initiate state-data)) + (list (ecase (plist-get state-data :role) + (:initiator + :initiate) + (:target + :wait-for-initiate)) + state-data)) (:native-candidates-prepared ;; this code is currently unnecessary, as we never get the @@ -134,7 +139,12 @@ (let ((components (cdr event))) (fsm-debug-output "The native candidates are %S" components) (setq state-data (plist-put state-data :native-candidates components)) - (list :initiate state-data))) + (list (ecase (plist-get state-data :role) + (:initiator + :initiate) + (:target + :wait-for-initiate)) + state-data))) (:iq-set :defer))) |
|
From: Magnus H. <leg...@us...> - 2008-10-06 22:55:41
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5079 Modified Files: jabber-tox.el Log Message: Defer :iq-set in state :allocate Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jabber-tox.el 20 Mar 2008 12:20:10 -0000 1.2 +++ jabber-tox.el 6 Oct 2008 22:55:23 -0000 1.3 @@ -134,7 +134,10 @@ (let ((components (cdr event))) (fsm-debug-output "The native candidates are %S" components) (setq state-data (plist-put state-data :native-candidates components)) - (list :initiate state-data))))) + (list :initiate state-data))) + + (:iq-set + :defer))) (define-enter-state jingle :initiate (fsm state-data) |
|
From: Magnus H. <leg...@us...> - 2008-10-06 11:19:04
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16181 Modified Files: jabber-core.el jabber-autoaway.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-605 Creator: Magnus Henoch <ma...@fr...> Add jabber-autoaway-start to jabber-post-connect-hooks options; add autoload cookie for jabber-autoaway-start Index: jabber-core.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- jabber-core.el 21 Sep 2008 19:35:55 -0000 1.97 +++ jabber-core.el 6 Oct 2008 11:14:42 -0000 1.98 @@ -77,7 +77,8 @@ jabber-muc-autojoin jabber-whitespace-ping-start jabber-keepalive-start - jabber-vcard-avatars-find-current) + jabber-vcard-avatars-find-current + jabber-autoaway-start) :group 'jabber-core) (defcustom jabber-pre-disconnect-hook nil @@ -219,6 +220,9 @@ (jabber-jid-server jid) (jabber-jid-resource jid) registerp password network-server port connection-type)))) + + (require 'jabber) + (if (member (list username server) (mapcar Index: jabber-autoaway.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-autoaway.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- jabber-autoaway.el 30 Mar 2008 18:39:35 -0000 1.7 +++ jabber-autoaway.el 6 Oct 2008 11:14:42 -0000 1.8 @@ -85,6 +85,7 @@ (when jabber-autoaway-verbose (apply #'message args))) +;;;###autoload (defun jabber-autoaway-start (&optional ignored) "Start autoaway timer. The IGNORED argument is there so you can put this function in |
|
From: Magnus H. <leg...@us...> - 2008-10-06 11:19:01
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16166 Modified Files: jabber-roster.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-604 Creator: Magnus Henoch <ma...@fr...> Autoload cookies in jabber-roster Index: jabber-roster.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-roster.el,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- jabber-roster.el 19 Sep 2008 21:20:22 -0000 1.57 +++ jabber-roster.el 6 Oct 2008 11:14:29 -0000 1.58 @@ -224,6 +224,7 @@ (put 'jabber-roster-mode 'mode-class 'special) +;;;###autoload (defun jabber-switch-to-roster-buffer (&optional jc) "Switch to roster buffer. Optional JC argument is ignored; it's there so this function can @@ -486,6 +487,7 @@ resource-str) (insert "\n" resource-str))))))) +;;;###autoload (defun jabber-roster-update (jc new-items changed-items deleted-items) "Update roster, in memory and on display. Add NEW-ITEMS, update CHANGED-ITEMS and remove DELETED-ITEMS, all |
|
From: Magnus H. <leg...@us...> - 2008-10-05 02:16:49
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5698 Modified Files: NEWS Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-603 Creator: Magnus Henoch <ma...@fr...> Rearrange items in NEWS After all, support for multiple account is the main feature for this release. Index: NEWS =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- NEWS 29 Sep 2008 08:06:29 -0000 1.69 +++ NEWS 5 Oct 2008 00:03:52 -0000 1.70 @@ -1,16 +1,16 @@ -*- mode: outline -*- * New features in jabber.el 0.8 +** Support for multiple accounts +Configuration variables have changed. See section "Account settings" +in the manual. + ** Activity mode improved Customizable face for personal messages added, list of unwanted (banned) JIDs added ** Simple automatic answering machine Realized as alert. Can match regexp and answer with predefined string -** Support for multiple accounts -Configuration variables have changed. See section "Account settings" -in the manual. - ** OSD alerts (message, MUC, MUC-personal) ** Family of personal MUC alerts added |
