emacs-jabber-commit — jabber.el commit messages

emacs-jabber AUTHORS,1.17,1.18 jabber-presence.el,1.51,1.52

[Kirill A. K. <ca...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7522

Modified Files:
	AUTHORS jabber-presence.el 
Log Message:
preserve current status when switching between them by Alexander Solovyov


Index: jabber-presence.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-presence.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- jabber-presence.el	19 Sep 2008 21:07:32 -0000	1.51
+++ jabber-presence.el	21 Nov 2008 12:51:50 -0000	1.52
@@ -395,15 +395,15 @@
   (interactive (list
 		(when current-prefix-arg
 		  (jabber-read-with-input-method "status message: " *jabber-current-status* '*jabber-status-history*))))
-  (jabber-send-presence "away" status *jabber-current-priority*))
+  (jabber-send-presence "away" (if status status *jabber-current-status*) *jabber-current-priority*))
 
 (defun jabber-send-xa-presence (&optional status)
   "Send extended away presence.
 With prefix argument, ask for status message."
   (interactive (list
-		(when current-prefix-arg
-		  (jabber-read-with-input-method "status message: " *jabber-current-status* '*jabber-status-history*))))
-  (jabber-send-presence "xa" status *jabber-current-priority*))
+        (when current-prefix-arg
+          (jabber-read-with-input-method "status message: " *jabber-current-status* '*jabber-status-history*))))
+  (jabber-send-presence "xa" (if status status *jabber-current-status*) *jabber-current-priority*))
 
 ;;;###autoload
 (defun jabber-send-default-presence (&optional jc)
@@ -413,7 +413,10 @@
   (interactive)
   ;; jc is ignored.  It's only there so this function can be in
   ;; jabber-post-connect-hooks.
-  (jabber-send-presence jabber-default-show jabber-default-status jabber-default-priority))
+  (jabber-send-presence
+   jabber-default-show
+   (if (not (string= jabber-default-status "")) jabber-default-status *jabber-current-status*)
+   jabber-default-priority))
 
 (defun jabber-send-current-presence (&optional jc)
   "(Re-)send current presence.

Index: AUTHORS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/AUTHORS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- AUTHORS	19 Sep 2008 18:23:48 -0000	1.17
+++ AUTHORS	21 Nov 2008 12:51:50 -0000	1.18
@@ -22,5 +22,6 @@
 Milan Zamazal
 Xavier Maillard
 Vitaly Mayatskikh
+Alexander Solovyov
 
 arch-tag: 15700144-3BD9-11D9-871C-000A95C2FCD0

tox jabber-tox.el,1.25,1.26

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5318

Modified Files:
	jabber-tox.el 
Log Message:
Drop newlines from Ogg file name


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- jabber-tox.el	17 Nov 2008 23:50:22 -0000	1.25
+++ jabber-tox.el	17 Nov 2008 23:56:43 -0000	1.26
@@ -52,7 +52,10 @@
 (defconst tox-session-interface "net.sourceforge.emacs_jabber.ToxSession"
   "Interface of ToxSession object.")
 
-(defvar tox-my-ogg-answering-machine (shell-command-to-string "locate '*.ogg' | head -1")
+(defvar tox-my-ogg-answering-machine
+  (replace-regexp-in-string 
+   "\n" ""
+   (shell-command-to-string "locate '*.ogg' | head -1"))
   "The Ogg file to play to anyone who calls to us.
 This should go away once we have hooked up everything properly,
 with microphone and so on.  (Or maybe not...)")

tox jabber-tox.el,1.24,1.25

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4781

Modified Files:
	jabber-tox.el 
Log Message:
Require jabber-xml, for proper compilation


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- jabber-tox.el	17 Nov 2008 23:39:44 -0000	1.24
+++ jabber-tox.el	17 Nov 2008 23:50:22 -0000	1.25
@@ -22,6 +22,8 @@
 (require 'fsm)
 (require 'cl)
 
+(require 'jabber-xml)
+
 (defconst jingle-ns "urn:xmpp:jingle:0"
   "Jingle namespace (XEP-0166)")
 

tox Makefile.am,1.1,1.2 configure.ac,1.1,1.2

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4571

Modified Files:
	Makefile.am configure.ac 
Log Message:
Compile and install jabber-tox.el.


Index: configure.ac
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac	17 Nov 2008 23:33:08 -0000	1.1
+++ configure.ac	17 Nov 2008 23:45:48 -0000	1.2
@@ -14,5 +14,7 @@
 AC_SUBST(AM_CFLAGS, "$FARSIGHT_CFLAGS $DBUS_CFLAGS")
 AC_SUBST(LDADD, "$FARSIGHT_LIBS $DBUS_LIBS")
 
+AM_PATH_LISPDIR
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	17 Nov 2008 23:33:08 -0000	1.1
+++ Makefile.am	17 Nov 2008 23:45:48 -0000	1.2
@@ -27,3 +27,5 @@
 CLEANFILES=tox.service
 tox.service: tox.service.in config.status
 	sed -e "s,@""libexecdir@,$(libexecdir)," $(srcdir)/tox.service.in > $@
+
+dist_lisp_LISP=jabber-tox.el

tox jabber-tox.el,1.23,1.24

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4216

Modified Files:
	jabber-tox.el 
Log Message:
Use any Ogg file we find, not the hard-coded path for my computer.


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- jabber-tox.el	3 Nov 2008 23:57:47 -0000	1.23
+++ jabber-tox.el	17 Nov 2008 23:39:44 -0000	1.24
@@ -50,6 +50,11 @@
 (defconst tox-session-interface "net.sourceforge.emacs_jabber.ToxSession"
   "Interface of ToxSession object.")
 
+(defvar tox-my-ogg-answering-machine (shell-command-to-string "locate '*.ogg' | head -1")
+  "The Ogg file to play to anyone who calls to us.
+This should go away once we have hooked up everything properly,
+with microphone and so on.  (Or maybe not...)")
+
 (define-fsm jingle
   :start ((jc sid role jid) "Start a Jingle FSM.
 \(Specifically, for Jingle Audio, as that's all we support for now.)
@@ -90,7 +95,7 @@
     (fsm-debug-output "About to call SetOggVorbisAudioSource")
     (dbus-call-method :session tox-name tox-session tox-session-interface
 		      "SetOggVorbisAudioSource"
-		      "/home/magnus/musik/computervirus.ogg")
+		      tox-my-ogg-answering-machine)
     ;; There, now we just wait for the NativeCandidatesPrepared signal...
     ;; NO!  Don't do like those dead people do!  That signal will never
     ;; come.  I don't know why, though...

tox .cvsignore,NONE,1.1

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3682

Added Files:
	.cvsignore 
Log Message:
Ignore some files


--- NEW FILE: .cvsignore ---
tox-object-glue.h
tox-session-glue.h
tox-marshal.c
tox-marshal.h
tox.service

tox Makefile.am, NONE, 1.1 configure.ac, NONE, 1.1 tox.service.in, NONE, 1.1

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3365

Added Files:
	Makefile.am configure.ac tox.service.in 
Log Message:
Autoconf, automake, dbus service file


--- NEW FILE: configure.ac ---
AC_INIT([Talk over XMPP], [0.0.0], [ema...@li...], [tox])
AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror])

AC_PROG_CC

AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool,
				[$am_missing_run dbus-binding-tool])
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal,
			      [$am_missing_run glib-genmarshal])

PKG_CHECK_MODULES(FARSIGHT, [farsight-0.1], [], AC_MSG_ERROR([farsight not found; see README]))
PKG_CHECK_MODULES(DBUS, [dbus-glib-1], [], AC_MSG_ERROR([dbus-glib not found; see README]))

AC_SUBST(AM_CFLAGS, "$FARSIGHT_CFLAGS $DBUS_CFLAGS")
AC_SUBST(LDADD, "$FARSIGHT_LIBS $DBUS_LIBS")

AC_CONFIG_FILES([Makefile])
AC_OUTPUT

--- NEW FILE: Makefile.am ---
libexec_PROGRAMS=tox
tox_SOURCES=main.c tox.c tox-session.c tox.h tox-session.h \
	$(BUILT_SOURCES)

EXTRA_DIST=tox-object.xml tox-session.xml tox-marshal.list

BUILT_SOURCES=tox-object-glue.h tox-session-glue.h tox-marshal.c tox-marshal.h

tox-object-glue.h : tox-object.xml
	$(DBUS_BINDING_TOOL) --mode=glib-server --output=$@ --prefix=tox $(srcdir)/tox-object.xml 

tox-session-glue.h : tox-session.xml
	$(DBUS_BINDING_TOOL) --mode=glib-server --output=$@ --prefix=tox_session $(srcdir)/tox-session.xml

tox-marshal.c : tox-marshal.list
	$(GLIB_GENMARSHAL) --prefix=tox_marshal $(srcdir)/tox-marshal.list --header --body > $@.tmp
	mv $@.tmp $@

tox-marshal.h : tox-marshal.list
	$(GLIB_GENMARSHAL) --prefix=tox_marshal $(srcdir)/tox-marshal.list --header > $@.tmp
	mv $@.tmp $@


dbusservicedir=$(datadir)/dbus-1/services
dbusservice_DATA=tox.service
EXTRA_DIST+=tox.service.in
CLEANFILES=tox.service
tox.service: tox.service.in config.status
	sed -e "s,@""libexecdir@,$(libexecdir)," $(srcdir)/tox.service.in > $@

--- NEW FILE: tox.service.in ---
[D-BUS Service]
Name=net.sourceforge.emacs-jabber.Tox
Exec=@libexecdir@/tox

tox tox-session.c,1.6,1.7

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21698

Modified Files:
	tox-session.c 
Log Message:
s/farsight_stream_set_remote_candidate_list /farsight_stream_set_remote_codecs/.  No wonder that didn't work :)


Index: tox-session.c
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/tox-session.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tox-session.c	3 Nov 2008 23:53:52 -0000	1.6
+++ tox-session.c	4 Nov 2008 00:02:59 -0000	1.7
@@ -445,7 +445,7 @@
     codec_list = g_list_append(codec_list, codec_out);
   }
 
-  farsight_stream_set_remote_candidate_list(obj->priv->stream, codec_list);
+  farsight_stream_set_remote_codecs(obj->priv->stream, codec_list);
 
   /* should the elements be freed, or just the list itself? */
   /*for (j = codec_list; j; j = g_list_next(j)) {

tox jabber-tox.el,1.22,1.23

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21172

Modified Files:
	jabber-tox.el 
Log Message:
More debug output, pointing to a problem with codec intersection


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- jabber-tox.el	3 Nov 2008 23:53:51 -0000	1.22
+++ jabber-tox.el	3 Nov 2008 23:57:47 -0000	1.23
@@ -251,41 +251,44 @@
 	 (list nil state-data))
 			       
 	(t
-	 (let ((tox-session (plist-get state-data :tox-session)))
+	 (let ((tox-session (plist-get state-data :tox-session))
+	       (their-codecs (mapcar
+			      (lambda (pt)
+				(jabber-xml-let-attributes 
+				    (id name clockrate channels) pt
+				  (list :struct
+					:int32 (string-to-number id)
+					:string name
+					:byte 0
+					:uint32 (string-to-number clockrate)
+					:uint32 (if channels
+						    (string-to-number channels)
+						  1)
+					(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)))
+	   (fsm-debug-output "Their codecs are %S" their-codecs)
 	   ;; 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 (string-to-number clockrate)
-		       :uint32 (if channels
-				   (string-to-number channels)
-				 1)
-		       (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))
+	    their-codecs)
 
 	   ;; Check if we have any codecs in common
 	   (let ((codec-intersection
 		  (dbus-call-method
 		   :session tox-name tox-session tox-session-interface
 		   "GetCodecIntersection")))
+	     (fsm-debug-output "The codec intersection is %S" codec-intersection)
 	     (setq state-data
 		   (plist-put 
 		    state-data

tox jabber-tox.el, 1.21, 1.22 tox-marshal.list, 1.2, 1.3 tox-session.c, 1.5, 1.6 tox-session.xml, 1.3, 1.4

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20956

Modified Files:
	jabber-tox.el tox-marshal.list tox-session.c tox-session.xml 
Log Message:
New signal, new-active-candidate-pair


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- jabber-tox.el	29 Oct 2008 23:50:35 -0000	1.21
+++ jabber-tox.el	3 Nov 2008 23:53:51 -0000	1.22
@@ -119,6 +119,15 @@
 			      (fsm-send-sync 
 			       fsm 
 			       (list :state-changed state direction)))))
+    ;; And about active candidate pairs.
+    (dbus-register-signal :session tox-name tox-session tox-session-interface
+			  "NewActiveCandidatePair"
+			  (lexical-let ((fsm fsm))
+			    (lambda (native-candidate remote-candidate)
+			      (fsm-send-sync 
+			       fsm 
+			       (list :new-active-candidate-pair
+				     native-candidate remote-candidate)))))
     (fsm-debug-output "Waiting")
     state-data))
 
@@ -293,15 +302,23 @@
 			       '((reason () (media-error))))
 	       (list nil state-data))))))))))
 
-(define-state jingle :wait-for-codec-intersection
+(define-state jingle :pending
   (fsm state-data event callback)
 
-;; 	 ;; Good enough, provisionally accept.
-;; 	 (jabber-send-iq jc from "result" ()
-;; 			 nil nil nil nil id)
-;; 	 (list :pending state-data)))))))
-
-  )
+  (case (car-safe event)
+    (:state-changed
+     (let ((state (car (assq (second event)
+			     '((0 . :disconnected)
+			       (1 . :connecting)
+			       (2 . :connected)))))
+	   (direction (car (assq (third event)
+				 '((1 . :send-only)
+				   (2 . :receive-only)
+				   (3 . :send-and-receive))))))
+       (fsm-debug-output "Got :state-changed; new state %s, new direction %s"
+			 state direction)
+       ;; Still, not sure what we should do here...
+       ))))
 
 (defun jingle-send-iq (state-data action payload)
   "Send a Jingle IQ stanza from within a Jingle FSM.

Index: tox-session.xml
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/tox-session.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tox-session.xml	29 Oct 2008 23:50:35 -0000	1.3
+++ tox-session.xml	3 Nov 2008 23:53:52 -0000	1.4
@@ -81,5 +81,10 @@
       <arg name='direction' type='y'/>
     </signal>
 
+    <signal name="NewActiveCandidatePair">
+      <arg name="nativeCandidateId" type="s"/>
+      <arg name="removeCandidateId" type="s"/>
+    </signal>
+
   </interface>
 </node>

Index: tox-marshal.list
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/tox-marshal.list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tox-marshal.list	29 Oct 2008 23:50:35 -0000	1.2
+++ tox-marshal.list	3 Nov 2008 23:53:52 -0000	1.3
@@ -1,2 +1,3 @@
 VOID:BOXED
 VOID:UCHAR,UCHAR
+VOID:STRING,STRING

Index: tox-session.c
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/tox-session.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tox-session.c	29 Oct 2008 23:50:35 -0000	1.5
+++ tox-session.c	3 Nov 2008 23:53:52 -0000	1.6
@@ -38,6 +38,7 @@
   NEW_NATIVE_CANDIDATE,
   NATIVE_CANDIDATES_PREPARED,
   STATE_CHANGED,
+  NEW_ACTIVE_CANDIDATE_PAIR,
   LAST_SIGNAL
 };
 
@@ -55,6 +56,7 @@
 static void tox_session_native_candidates_prepared(FarsightStream *stream, gpointer user_data);
 static void tox_session_new_native_candidate(FarsightStream *stream, gchar *candidate_id, ToxSession *self);
 static void tox_session_state_changed(FarsightStream *stream, gint state, gint direction, ToxSession *self);
+static void tox_session_new_active_candidate_pair(FarsightStream *stream, gchar *native_candidate_id, gchar *remote_candidate_id, ToxSession *self);
 
 void
 tox_session_init(ToxSession *obj)
@@ -163,6 +165,18 @@
 		 G_TYPE_UCHAR,
 		 G_TYPE_UCHAR);
 
+  signals[NEW_ACTIVE_CANDIDATE_PAIR] =
+    g_signal_new("new-active-candidate-pair",
+		 G_OBJECT_CLASS_TYPE(klass),
+		 G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+		 0,
+		 NULL, NULL,
+		 tox_marshal_VOID__STRING_STRING,
+		 G_TYPE_NONE,
+		 2,
+		 G_TYPE_STRING,
+		 G_TYPE_STRING);
+
   dbus_g_object_type_install_info(TOX_TYPE_SESSION, &dbus_glib_tox_session_object_info);
 
   parent_class = g_type_class_peek_parent (klass);
@@ -205,10 +219,15 @@
 		     (GCallback)tox_session_new_native_candidate, (gpointer)self);
     g_signal_connect(self->priv->stream, "native-candidates-prepared",
 		     (GCallback)tox_session_native_candidates_prepared, (gpointer)self);
-    g_signal_connect(self->priv->stream, "state-changed",
-		     (GCallback)tox_session_state_changed, (gpointer)self);
     /* but we can't actually do it until we have a pipeline.
        so, we'll call stream_done when we do. */
+
+    /* Other signals we want to forward */
+    g_signal_connect(self->priv->stream, "state-changed",
+		     (GCallback)tox_session_state_changed, (gpointer)self);
+    g_signal_connect(self->priv->stream, "new-active-candidate-pair",
+		     (GCallback)tox_session_new_active_candidate_pair, (gpointer)self);
+
     break;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, property_id, pspec);
@@ -725,3 +744,9 @@
 {
   g_signal_emit(self, signals[STATE_CHANGED], 0, state, direction);
 }
+
+static void
+tox_session_new_active_candidate_pair(FarsightStream *stream, gchar *native_candidate_id, gchar *remote_candidate_id, ToxSession *self)
+{
+  g_signal_emit(self, signals[NEW_ACTIVE_CANDIDATE_PAIR], 0, native_candidate_id, remote_candidate_id);
+}

emacs-jabber jabber-chatbuffer.el,2.15,2.16

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3365

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

Don't fill lines we are not supposed to fill

In jabber-chat-buffer-fill-long-lines, move the save-restriction inwards.


Index: jabber-chatbuffer.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-chatbuffer.el,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- jabber-chatbuffer.el	17 Jun 2008 14:51:41 -0000	2.15
+++ jabber-chatbuffer.el	1 Nov 2008 11:58:19 -0000	2.16
@@ -119,19 +119,18 @@
   (save-excursion
     (let ((inhibit-read-only t)
 	  (width (window-width (get-buffer-window (current-buffer)))))
-      (save-restriction
-	(goto-char (point-min))
-	(let ((adaptive-fill-mode nil)) ;Why?  -sm
-	  (while (not (eobp))
-	    (end-of-line)
-	    (when (>= (current-column) (min fill-column width))
+      (goto-char (point-min))
+      (let ((adaptive-fill-mode nil))	;Why?  -sm
+	(while (not (eobp))
+	  (end-of-line)
+	  (when (>= (current-column) (min fill-column width))
+	    (save-restriction
 	      (narrow-to-region (min (1+ (point)) (point-max))
 				(point-at-bol))
-              (let ((goback (point-marker)))
-                (fill-paragraph nil)
-                (goto-char (marker-position goback)))
-	      (widen))
-	    (forward-line 1)))))))
+	      (let ((goback (point-marker)))
+		(fill-paragraph nil)
+		(goto-char (marker-position goback)))))
+	  (forward-line 1))))))
 
 (provide 'jabber-chatbuffer)
 ;; arch-tag: 917e5b60-5894-4c49-b3bc-12e1f97ffdc6

emacs-jabber jabber-core.el,1.98,1.99

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3342

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

More flexible prefix argument handling for jabber-connect-all


Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- jabber-core.el	6 Oct 2008 11:14:42 -0000	1.98
+++ jabber-core.el	1 Nov 2008 11:58:05 -0000	1.99
@@ -140,14 +140,25 @@
 (defun jabber-connect-all (&optional arg)
   "Connect to all configured Jabber accounts.
 See `jabber-account-list'.
-If no accounts are configured (or ARG supplied), call `jabber-connect' interactively."
+If no accounts are configured (or with prefix argument), call `jabber-connect' interactively.
+With many prefix arguments, one less is passed to `jabber-connect'."
   (interactive "P")
   (let ((accounts
 	 (remove-if (lambda (account)
 		      (cdr (assq :disabled (cdr account))))
 		    jabber-account-list)))
     (if (or (null accounts) arg)
-	(progn (setq current-prefix-arg nil) (call-interactively 'jabber-connect))
+	(let ((current-prefix-arg
+	       (cond
+		;; A number of C-u's; remove one, so to speak.
+		((consp arg)
+		 (if (> (car arg) 4)
+		     (list (/ (car arg) 4))
+		   nil))
+		;; Otherwise, we just don't care.
+		(t
+		 arg))))
+	  (call-interactively 'jabber-connect))
       ;; Only connect those accounts that are not yet connected.
       (let ((already-connected (mapcar #'jabber-connection-bare-jid jabber-connections))
 	    (connected-one nil))

tox jabber-tox.el, 1.20, 1.21 tox-marshal.list, 1.1, 1.2 tox-session.c, 1.4, 1.5 tox-session.xml, 1.2, 1.3

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30223

Modified Files:
	jabber-tox.el tox-marshal.list tox-session.c tox-session.xml 
Log Message:
New signal: state-changed.  Untested so far...


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- jabber-tox.el	23 Oct 2008 22:09:14 -0000	1.20
+++ jabber-tox.el	29 Oct 2008 23:50:35 -0000	1.21
@@ -111,6 +111,14 @@
 			      (fsm-send-sync 
 			       fsm 
 			       (cons :new-native-candidate components)))))
+    ;; And we also want to know about state changes.
+    (dbus-register-signal :session tox-name tox-session tox-session-interface
+			  "StateChanged"
+			  (lexical-let ((fsm fsm))
+			    (lambda (state direction)
+			      (fsm-send-sync 
+			       fsm 
+			       (list :state-changed state direction)))))
     (fsm-debug-output "Waiting")
     state-data))
 

Index: tox-session.xml
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/tox-session.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tox-session.xml	20 Mar 2008 12:19:23 -0000	1.2
+++ tox-session.xml	29 Oct 2008 23:50:35 -0000	1.3
@@ -66,5 +66,20 @@
       <!-- Argument layout: see SetRemoteCodecs -->
     </method>
 
+    <signal name="StateChanged">
+      <!-- state is one of:
+	   0: disconnected
+	   1: connecting
+	   2: connected
+	-->
+      <arg name='newstate' type='y'/>
+      <!-- direction is one of:
+	   1: send only.
+           2: receive only.
+	   3: send and receive.
+      -->
+      <arg name='direction' type='y'/>
+    </signal>
+
   </interface>
 </node>

Index: tox-marshal.list
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/tox-marshal.list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tox-marshal.list	17 Jan 2008 00:45:22 -0000	1.1
+++ tox-marshal.list	29 Oct 2008 23:50:35 -0000	1.2
@@ -1 +1,2 @@
 VOID:BOXED
+VOID:UCHAR,UCHAR

Index: tox-session.c
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/tox-session.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tox-session.c	23 Oct 2008 22:08:50 -0000	1.4
+++ tox-session.c	29 Oct 2008 23:50:35 -0000	1.5
@@ -37,6 +37,7 @@
 enum {
   NEW_NATIVE_CANDIDATE,
   NATIVE_CANDIDATES_PREPARED,
+  STATE_CHANGED,
   LAST_SIGNAL
 };
 
@@ -53,6 +54,7 @@
 
 static void tox_session_native_candidates_prepared(FarsightStream *stream, gpointer user_data);
 static void tox_session_new_native_candidate(FarsightStream *stream, gchar *candidate_id, ToxSession *self);
+static void tox_session_state_changed(FarsightStream *stream, gint state, gint direction, ToxSession *self);
 
 void
 tox_session_init(ToxSession *obj)
@@ -149,6 +151,18 @@
 		 1,
 		 G_TYPE_VALUE_ARRAY);
 
+  signals[STATE_CHANGED] =
+    g_signal_new("state-changed",
+		 G_OBJECT_CLASS_TYPE(klass),
+		 G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+		 0,
+		 NULL, NULL,
+		 tox_marshal_VOID__UCHAR_UCHAR,
+		 G_TYPE_NONE,
+		 2,
+		 G_TYPE_UCHAR,
+		 G_TYPE_UCHAR);
+
   dbus_g_object_type_install_info(TOX_TYPE_SESSION, &dbus_glib_tox_session_object_info);
 
   parent_class = g_type_class_peek_parent (klass);
@@ -191,6 +205,8 @@
 		     (GCallback)tox_session_new_native_candidate, (gpointer)self);
     g_signal_connect(self->priv->stream, "native-candidates-prepared",
 		     (GCallback)tox_session_native_candidates_prepared, (gpointer)self);
+    g_signal_connect(self->priv->stream, "state-changed",
+		     (GCallback)tox_session_state_changed, (gpointer)self);
     /* but we can't actually do it until we have a pipeline.
        so, we'll call stream_done when we do. */
     break;
@@ -703,3 +719,9 @@
 
   return array;
 }
+
+static void
+tox_session_state_changed(FarsightStream *stream, gint state, gint direction, ToxSession *self)
+{
+  g_signal_emit(self, signals[STATE_CHANGED], 0, state, direction);
+}

tox jabber-tox.el,1.19,1.20

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13442

Modified Files:
	jabber-tox.el 
Log Message:
Fix various silly errors


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- jabber-tox.el	17 Oct 2008 16:10:19 -0000	1.19
+++ jabber-tox.el	23 Oct 2008 22:09:14 -0000	1.20
@@ -221,7 +221,7 @@
 	;; negotiate away other content types later.
 	((null audio-content)
 	 (jingle-send-iq state-data "session-terminate"
-			 '(reason () (unsupported-applications)))
+			 '((reason () (unsupported-applications))))
 	 (list nil state-data))
 
 	;; Make sure ICE is in the list of transports.
@@ -230,7 +230,7 @@
 		       :test 'string=
 		       :key 'jabber-xml-get-xmlns))
 	 (jingle-send-iq state-data "session-terminate"
-			 '(reason () (unsupported-transports)))
+			 '((reason () (unsupported-transports))))
 	 (list nil state-data))
 			       
 	(t
@@ -248,8 +248,10 @@
 		       :int32 (string-to-number id)
 		       :string name
 		       :byte 0
-		       :uint32 clockrate
-		       :uint32 channels
+		       :uint32 (string-to-number clockrate)
+		       :uint32 (if channels
+				   (string-to-number channels)
+				 1)
 		       (cons
 			:array
 			(or
@@ -280,7 +282,7 @@
 	       ;; 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)))
+			       '((reason () (media-error))))
 	       (list nil state-data))))))))))
 
 (define-state jingle :wait-for-codec-intersection

tox tox-session.c,1.3,1.4

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13393

Modified Files:
	tox-session.c 
Log Message:
s/int/uchar/


Index: tox-session.c
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/tox-session.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tox-session.c	16 Oct 2008 16:13:02 -0000	1.3
+++ tox-session.c	23 Oct 2008 22:08:50 -0000	1.4
@@ -403,7 +403,7 @@
     codec_out->id = g_value_get_int(g_value_array_get_nth(codec_in, 0));
     codec_out->encoding_name = g_value_dup_string(g_value_array_get_nth(codec_in, 1));
     /* maybe check range of media_type... */
-    codec_out->media_type = g_value_get_int(g_value_array_get_nth(codec_in, 2));
+    codec_out->media_type = g_value_get_uchar(g_value_array_get_nth(codec_in, 2));
     codec_out->clock_rate = g_value_get_uint(g_value_array_get_nth(codec_in, 3));
     codec_out->channels = g_value_get_uint(g_value_array_get_nth(codec_in, 4));
 

emacs-jabber configure.ac,1.8,1.9 NEWS,1.70,1.71 Makefile.am,1.8,1.9

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22140

Modified Files:
	configure.ac NEWS Makefile.am 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-612
Creator:  Magnus Henoch <ma...@fr...>

Install GConf schema for XMPP URI handler


Index: NEWS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- NEWS	5 Oct 2008 00:03:52 -0000	1.70
+++ NEWS	23 Oct 2008 01:23:49 -0000	1.71
@@ -51,6 +51,9 @@
 ** Gmail notifications
 (Not documented nor autoloaded)
 
+** GConf-based installation of URI handler
+(Not documented yet)
+
 * New features in jabber.el 0.7.1
 
 ** STARTTLS

Index: configure.ac
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac	30 Sep 2008 12:02:51 -0000	1.8
+++ configure.ac	23 Oct 2008 01:23:49 -0000	1.9
@@ -12,5 +12,10 @@
 AM_CONDITIONAL([USE_OUR_SHA1], [test x$HAVE_SHA1 = xno -a x$HAVE_SHA1_EL = xno])
 AM_CONDITIONAL([USE_OUR_HEX_UTIL], [test x$HAVE_HEX_UTIL = xno])
 
-AC_CONFIG_FILES([Makefile tests/Makefile jabber-ourversion.el])
+dnl GConf schemas, for registering our URL handler
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+AM_CONDITIONAL(USE_GCONFTOOL, test "x$GCONFTOOL" != "xno")
+AM_GCONF_SOURCE_2
+
+AC_CONFIG_FILES([Makefile tests/Makefile gconf/Makefile jabber-ourversion.el])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	17 Jun 2008 14:51:04 -0000	1.8
+++ Makefile.am	23 Oct 2008 01:23:49 -0000	1.9
@@ -54,6 +54,11 @@
 dist_libexec_SCRIPTS = xmppuri.sh
 
 SUBDIRS = . tests
+if USE_GCONFTOOL
+if GCONF_SCHEMAS_INSTALL
+SUBDIRS += gconf
+endif
+endif
 
 # Package everything in a form suitable for ELPA.  That is, use
 # "jabber" instead of "emacs-jabber" as base name.

emacs-jabber/gconf emacs-jabber.schemas.in, NONE, 1.1 Makefile.am, NONE, 1.1

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

Update of /cvsroot/emacs-jabber/emacs-jabber/gconf
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22140/gconf

Added Files:
	emacs-jabber.schemas.in Makefile.am 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-612
Creator:  Magnus Henoch <ma...@fr...>

Install GConf schema for XMPP URI handler


--- NEW FILE: Makefile.am ---
schemadir = $(GCONF_SCHEMA_FILE_DIR)

schema_DATA = emacs-jabber.schemas
CLEANFILES = $(schema_DATA)
EXTRA_DIST = emacs-jabber.schemas.in

emacs-jabber.schemas: emacs-jabber.schemas.in Makefile
	sed -e "s|@""libexecdir@""|$(libexecdir)|" < $(srcdir)/emacs-jabber.schemas.in > emacs-jabber.schemas

install-data-local:
	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)

uninstall-local:
	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)

--- NEW FILE: emacs-jabber.schemas.in ---
<?xml version="1.0"?>
<gconfschemafile>
  <schemalist>
    <schema>
      <key>/schemas/desktop/gnome/url-handlers/xmpp/enabled</key>
      <applyto>/desktop/gnome/url-handlers/xmpp/enabled</applyto>
      <owner>emacs-jabber</owner>
      <type>bool</type>
      <default>true</default>
      <locale name="C">
        <short>Whether the specified command should handle "xmpp" URLs</short>
        <long>True if the command specified in the "command" key should handle "xmpp" URLs.</long>
      </locale>
    </schema>
    <schema>
      <key>/schemas/desktop/gnome/url-handlers/xmpp/command</key>
      <applyto>/desktop/gnome/url-handlers/xmpp/command</applyto>
      <owner>emacs-jabber</owner>
      <type>string</type>
      <default>@libexecdir@/xmppuri.sh "%s"</default>
      <locale name="C">
        <short>The handler for "xmpp" URLs</short>
        <long>The command used to handle "xmpp" URLs, if enabled.</long>
      </locale>
    </schema>
    <schema>
      <key>/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal</key>
      <applyto>/desktop/gnome/url-handlers/xmpp/needs_terminal</applyto>
      <owner>emacs-jabber</owner>
      <type>bool</type>
      <default>false</default>
      <locale name="C">
        <short>Run the command in a terminal</short>
        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
      </locale>
    </schema>
  </schemalist>
</gconfschemafile>

emacs-jabber/gconf - New directory

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

Update of /cvsroot/emacs-jabber/emacs-jabber/gconf
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22110/gconf

Log Message:
Directory /cvsroot/emacs-jabber/emacs-jabber/gconf added to the repository

emacs-jabber jabber-menu.el,1.7,1.8

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22087

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

Use bound-and-true-p for jabber-connections in menu predicate


Index: jabber-menu.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-menu.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jabber-menu.el	23 Oct 2008 01:23:20 -0000	1.7
+++ jabber-menu.el	23 Oct 2008 01:23:29 -0000	1.8
@@ -19,6 +19,9 @@
 ;; along with this program; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+(require 'jabber-util)
+(require 'jabber-autoloads)
+
 (defvar jabber-menu (make-sparse-keymap "jabber-menu"))
 
 (defcustom jabber-display-menu 'maybe
@@ -45,7 +48,8 @@
   (list 'menu-item "Jabber" jabber-menu
 	:visible '(or (eq jabber-display-menu t)
 		      (and (eq jabber-display-menu 'maybe)
-			   (or jabber-account-list jabber-connections)))))
+			   (or jabber-account-list
+			       (bound-and-true-p jabber-connections))))))
 
 (define-key jabber-menu
   [jabber-menu-connect]

emacs-jabber jabber-menu.el,1.6,1.7

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22076

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

Use jabber-connect-all for "Connect" in the menu


Index: jabber-menu.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-menu.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jabber-menu.el	23 Oct 2008 01:23:12 -0000	1.6
+++ jabber-menu.el	23 Oct 2008 01:23:20 -0000	1.7
@@ -49,7 +49,7 @@
 
 (define-key jabber-menu
   [jabber-menu-connect]
-  '("Connect" . jabber-connect))
+  '("Connect" . jabber-connect-all))
 
 (define-key jabber-menu
   [jabber-menu-disconnect]

emacs-jabber jabber-menu.el,1.5,1.6

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22065

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

Add missing period in docstring


Index: jabber-menu.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-menu.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jabber-menu.el	22 Oct 2008 23:12:37 -0000	1.5
+++ jabber-menu.el	23 Oct 2008 01:23:12 -0000	1.6
@@ -38,7 +38,7 @@
   (interactive "P")
   (setq jabber-display-menu (if remove nil t))
   (force-mode-line-update))
-(make-obsolete 'jabber-menu "set the variable `jabber-display-menu' instead")
+(make-obsolete 'jabber-menu "set the variable `jabber-display-menu' instead.")
 
 (define-key-after global-map
   [menu-bar jabber-menu]

emacs-jabber jabber.texi,1.135,1.136 jabber-menu.el,1.4,1.5

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15066

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

Menu hacking

New variable jabber-display-menu controls whether Jabber menu is on menu bar.
Default: yes, if there is evidence that the user uses Jabber.
Put Jabber menu last instead of first.
Update documentation.


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- jabber.texi	21 Sep 2008 19:30:36 -0000	1.135
+++ jabber.texi	22 Oct 2008 23:12:37 -0000	1.136
@@ -1659,14 +1659,18 @@
 @node Menu, Customizing the roster buffer, Account settings, Customization
 @section Menu
 
-@findex jabber-menu
+@vindex jabber-display-menu
 @cindex Menus
+There is a Jabber menu on the menu bar with some common commands.  By
+default, it is displayed only if you are connected, or if you have
+configured any accounts.  You can set the variable
+@code{jabber-display-menu} to @code{t} or @code{nil}, to have the menu
+displayed always or never, respectively.  The default behaviour
+corresponds to the setting @code{maybe}.
 
-If you want a Jabber menu on the menu bar with some common commands,
-type @kbd{M-x jabber-menu}.  You can remove it again with @kbd{C-u M-x
-jabber-menu}.  Unfortunately, this cannot be changed through Customize
-settings, so you need to add @code{(jabber-menu)} to your @file{.emacs}
-to enable it permanently.
+@findex jabber-menu
+Earlier, the way to have the menu appear was to call the function
+@code{jabber-menu}.  It still works, but is considered obsolete.
 
 @node Customizing the roster buffer, Customizing the chat buffer, Menu, Customization
 @section Customizing the roster buffer

Index: jabber-menu.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-menu.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jabber-menu.el	27 Dec 2005 21:44:36 -0000	1.4
+++ jabber-menu.el	22 Oct 2008 23:12:37 -0000	1.5
@@ -1,7 +1,7 @@
 ;; jabber-menu.el - menu definitions
 
+;; Copyright (C) 2003, 2004, 2008 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
-;; Copyright (C) 2003, 2004 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -21,13 +21,31 @@
 
 (defvar jabber-menu (make-sparse-keymap "jabber-menu"))
 
+(defcustom jabber-display-menu 'maybe
+  "Decide whether the \"Jabber\" menu is displayed in the menu bar.
+If t, always display.
+If nil, never display.
+If maybe, display if any of `jabber-account-list' or `jabber-connections'
+is non-nil."
+  :group 'jabber
+  :type '(choice (const :tag "Never" nil)
+		 (const :tag "Always" t)
+		 (const :tag "When any accounts have been configured or connected" maybe)))
+
 (defun jabber-menu (&optional remove)
   "Put \"Jabber\" menu on menubar.
 With prefix argument, remove it."
   (interactive "P")
-  (define-key global-map
-    [menu-bar jabber-menu]
-    (and (not remove) (cons "Jabber" jabber-menu))))
+  (setq jabber-display-menu (if remove nil t))
+  (force-mode-line-update))
+(make-obsolete 'jabber-menu "set the variable `jabber-display-menu' instead")
+
+(define-key-after global-map
+  [menu-bar jabber-menu]
+  (list 'menu-item "Jabber" jabber-menu
+	:visible '(or (eq jabber-display-menu t)
+		      (and (eq jabber-display-menu 'maybe)
+			   (or jabber-account-list jabber-connections)))))
 
 (define-key jabber-menu
   [jabber-menu-connect]

emacs-jabber jabber.texi,1.136,1.137

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15088

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

Manual: index entry for jabber-account-list


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- jabber.texi	22 Oct 2008 23:12:37 -0000	1.136
+++ jabber.texi	22 Oct 2008 23:12:46 -0000	1.137
@@ -1605,6 +1605,7 @@
 @cindex JID
 @cindex Network server
 
+@vindex jabber-account-list
 All account settings reside in the variable @code{jabber-account-list}.
 Usually you only need to set the JID, in the form
 @samp{username@@server} (or @samp{username@@server/resource} to use a

emacs-jabber jabber-version.el,1.13,1.14

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14714

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

Remove obsolete comment


Index: jabber-version.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-version.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jabber-version.el	30 May 2008 21:56:56 -0000	1.13
+++ jabber-version.el	22 Oct 2008 23:04:10 -0000	1.14
@@ -30,7 +30,6 @@
   (interactive (list
 		(jabber-read-account)
 		(jabber-read-jid-completing "Request version of: " nil nil nil 'full)))
-  ;; XXX: you will not get any result unless you add the resource to the JID.
   (jabber-send-iq jc to
 		  "get"
 		  '(query ((xmlns . "jabber:iq:version")))

www index.muse,1.3,1.4

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

Update of /cvsroot/emacs-jabber/www
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12324

Modified Files:
	index.muse 
Log Message:
Rearrange and extend "external resources"


Index: index.muse
===================================================================
RCS file: /cvsroot/emacs-jabber/www/index.muse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.muse	5 Oct 2008 01:03:03 -0000	1.3
+++ index.muse	21 Oct 2008 18:54:32 -0000	1.4
@@ -17,10 +17,18 @@
 
 External resources:
 
- - [[http://sourceforge.net/projects/emacs-jabber/][Sourceforge project page]]
+ - [[http://sourceforge.net/projects/emacs-jabber/][Sourceforge project page]], containing:
+   - trackers for
+     [[http://sourceforge.net/tracker/?atid=586350&group_id=88346&func=browse][bugs]],
+     [[http://sourceforge.net/tracker/?atid=586353&group_id=88346&func=browse][feature requests]],
+     [[http://sourceforge.net/tracker/?atid=586352&group_id=88346&func=browse][patches]] and
+     [[http://sourceforge.net/tracker/?atid=586351&group_id=88346&func=browse][support requests]], open for anonymous posters
+   - [[http://sourceforge.net/forum/?group_id=88346][forums]], open for anonymous posters
  - [[http://www.emacswiki.org/cgi-bin/wiki/JabberEl][the JabberEl page of EmacsWiki]]
- - the mailing list [[http://lists.sourceforge.net/lists/listinfo/emacs-jabber-general][emacs-jabber-general]]; also available as [[http://dir.gmane.org/gmane.emacs.jabber.general][gmane.emacs.jabber.general]] on [[http://gmane.org][Gmane]]
- - read-only mailing list of CVS commits [[http://lists.sourceforge.net/lists/listinfo/emacs-jabber-commit][emacs-jabber-commit]]; also available as [[http://dir.gmane.org/gmane.emacs.jabber.scm][gmane.emacs.jabber.scm]] on [[http://gmane.org][Gmane]]
+ - Mailing lists (also available at [[http://gmane.net][Gmane]]):
+   - [[http://lists.sourceforge.net/lists/listinfo/emacs-jabber-general][emacs-jabber-general]], for posts by humans (also [[http://dir.gmane.org/gmane.emacs.jabber.general][gmane.emacs.jabber.general]])
+   - [[http://lists.sourceforge.net/lists/listinfo/emacs-jabber-commit][emacs-jabber-commit]], read-only mailing list of CVS commits (also [[http://dir.gmane.org/gmane.emacs.jabber.scm][gmane.emacs.jabber.scm]])
+   - [[http://lists.sourceforge.net/lists/listinfo/emacs-jabber-bugs][emacs-jabber-bugs]], read-only mailing list of bug tracker activity (also [[http://dir.gmane.org/gmane.emacs.jabber.bugs][gmane.emacs.jabber.bugs]])
  - the Jabber chat room [[xmpp:jab...@co...?join][jab...@co...]], and its [[http://www.jabber.se/muc-logs/jab...@co.../][logs]]
  - the [[manual-0.7.1/][manual for jabber.el 0.7.1]] (also included in the release files)