[SCM] emacs-jabber branch, master, updated. 818c52e7db386c77a5b857ea1d2253f5ab26350f

[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  818c52e7db386c77a5b857ea1d2253f5ab26350f (commit)
      from  dd049eb4b50424b87b77ecac907d11397eaa4071 (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 818c52e7db386c77a5b857ea1d2253f5ab26350f
Author: Magnus Henoch <mag...@gm...>
Date:   Fri Jan 10 15:10:45 2014 +0000

    Handle {frame,icon}-title-format being t in more cases
    
    Need to check when deactivating jabber-activity-mode as well.

diff --git a/jabber-activity.el b/jabber-activity.el
index 131835b..90bfa30 100644
--- a/jabber-activity.el
+++ b/jabber-activity.el
@@ -416,12 +416,14 @@ With a numeric arg, enable this display if arg is positive."
 ;; 		   'jabber-activity-make-name-alist)
       (setq global-mode-string (delete '(t jabber-activity-mode-string)
 				       global-mode-string))
-      (setq frame-title-format
-	    (delete jabber-activity-count-in-title-format
-		    frame-title-format))
-      (setq icon-title-format
-	    (delete jabber-activity-count-in-title-format
-		    icon-title-format)))))
+      (when (listp frame-title-format)
+	(setq frame-title-format
+	      (delete jabber-activity-count-in-title-format
+		      frame-title-format)))
+      (when (listp icon-title-format)
+	(setq icon-title-format
+	      (delete jabber-activity-count-in-title-format
+		      icon-title-format))))))
 
 ;; XXX: define-minor-mode should probably do this for us, but it doesn't.
 (if jabber-activity-mode (jabber-activity-mode 1))

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

Summary of changes:
 jabber-activity.el |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
emacs-jabber