emacs-jabber jabber-activity.el,1.30,1.31

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv5690

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

jabber-activity-switch-to: don't switch back unless we are in a chat buffer 


Index: jabber-activity.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-activity.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- jabber-activity.el	14 Sep 2007 23:14:03 -0000	1.30
+++ jabber-activity.el	26 Nov 2007 01:05:58 -0000	1.31
@@ -309,9 +309,11 @@
             (setq jabber-activity-last-buffer (current-buffer)))
           (switch-to-buffer (jabber-activity-find-buffer-name jid))
           (jabber-activity-clean))
-      ;; Switch back to the buffer used last
-      (when (buffer-live-p jabber-activity-last-buffer)
-	(switch-to-buffer jabber-activity-last-buffer))))
+      (if (eq major-mode 'jabber-chat-mode)
+	  ;; Switch back to the buffer used last
+	  (when (buffer-live-p jabber-activity-last-buffer)
+	    (switch-to-buffer jabber-activity-last-buffer))
+	(message "No new activity"))))
 
 ;;;###autoload
 (define-minor-mode jabber-activity-mode