[SCM] emacs-jabber branch, master, updated. e940e2deaa44d1cb1ee2a614fe81e6d7f7b0dd45

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".

The branch, master has been updated
       via  e940e2deaa44d1cb1ee2a614fe81e6d7f7b0dd45 (commit)
       via  edf1ec5da15db143991f6c9915363df0cc8be781 (commit)
       via  32df62fd02c417edfcb57d71ca26a26fd05f45f2 (commit)
      from  b0416214a3447be6efa8dc0bbc1777b7696f2274 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e940e2deaa44d1cb1ee2a614fe81e6d7f7b0dd45
Author: Magnus Henoch <mag...@gm...>
Date:   Fri Jul 27 09:04:54 2012 +0100

    Ensure that jabber-bookmarks is loaded in jabber-jid-bookmarkname

diff --git a/jabber-util.el b/jabber-util.el
index 103eabd..c7ceabb 100644
--- a/jabber-util.el
+++ b/jabber-util.el
@@ -187,6 +187,7 @@ Return nil if none found."
 
 (defun jabber-jid-bookmarkname (string)
   "Return the conference name from boomarks or displayname from roster, or JID if none set"
+  (require 'jabber-bookmarks)
   (or (loop for conference in (first (loop for value being the hash-values of jabber-bookmarks
                                            collect value))
             do (let ((ls (cadr conference)))

commit edf1ec5da15db143991f6c9915363df0cc8be781
Author: Magnus Henoch <mag...@gm...>
Date:   Fri Jul 27 09:04:32 2012 +0100

    Fix :get function for jabber-roster-default-group-name
    
    Because of an improperly nested `if', it would sometimes return nil
    instead of a string.

diff --git a/jabber-roster.el b/jabber-roster.el
index 8a9f759..92b1321 100644
--- a/jabber-roster.el
+++ b/jabber-roster.el
@@ -157,12 +157,12 @@ Trailing newlines are always removed, regardless of this variable."
   :type 'string
   :get '(lambda (var)
 	  (let ((val (symbol-value var)))
-	    (if (stringp val)
-		(set-text-properties 0 (length val) nil val)
-	      val)))
+	    (when (stringp val)
+	      (set-text-properties 0 (length val) nil val))
+	    val))
   :set '(lambda (var val)
-          (if (stringp val)
-              (set-text-properties 0 (length val) nil val))
+          (when (stringp val)
+	    (set-text-properties 0 (length val) nil val))
           (custom-set-default var val))
   )
 

commit 32df62fd02c417edfcb57d71ca26a26fd05f45f2
Author: Magnus Henoch <mag...@gm...>
Date:   Fri Jul 27 09:02:21 2012 +0100

    If all accounts are already connected in jabber-connect-all, say so

diff --git a/jabber-core.el b/jabber-core.el
index 58b233d..c7999e3 100644
--- a/jabber-core.el
+++ b/jabber-core.el
@@ -186,7 +186,10 @@ With many prefix arguments, one less is passed to `jabber-connect'."
 	       (jabber-jid-server jid)
 	       (jabber-jid-resource jid)
 	       nil password network-server
-	       port connection-type))))))))
+	       port connection-type)
+	      (setq connected-one t))))
+	(unless connected-one
+	  (message "All configured Jabber accounts are already connected"))))))
 
 ;;;###autoload (autoload 'jabber-connect "jabber" "Connect to the Jabber server and start a Jabber XML stream.\nWith prefix argument, register a new account.\nWith double prefix argument, specify more connection details." t)
 (defun jabber-connect (username server resource &optional

-----------------------------------------------------------------------

Summary of changes:
 jabber-core.el   |    5 ++++-
 jabber-roster.el |   10 +++++-----
 jabber-util.el   |    1 +
 3 files changed, 10 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
emacs-jabber