summaryrefslogtreecommitdiff
path: root/jabber-roster.el
diff options
context:
space:
mode:
authorMagnus Henoch <mange@freemail.hu>2007-03-20 11:49:59 +0000
committerKirill A. Korinskiy <catap@catap.ru>2007-03-20 11:49:59 +0000
commit61cfbe1dbbe24a3997192deda93649ca7e4687ef (patch)
tree1fee578aac96ceb351ddaaf773a93079333f57b2 /jabber-roster.el
parent805af56c496c363692e1bb719d5040dc4207778c (diff)
Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-330
Creator: Magnus Henoch <mange@freemail.hu> Properly forget lost connections
Diffstat (limited to 'jabber-roster.el')
-rw-r--r--jabber-roster.el30
1 files changed, 16 insertions, 14 deletions
diff --git a/jabber-roster.el b/jabber-roster.el
index 6da7ade..cc07669 100644
--- a/jabber-roster.el
+++ b/jabber-roster.el
@@ -1,7 +1,7 @@
;; jabber-roster.el - displaying the roster -*- coding: utf-8; -*-
;; Copyright (C) 2002, 2003, 2004 - tom berger - object@intelectronica.net
-;; Copyright (C) 2003, 2004 - Magnus Henoch - mange@freemail.hu
+;; Copyright (C) 2003, 2004, 2007 - Magnus Henoch - mange@freemail.hu
;; This file is a part of jabber.el.
@@ -300,19 +300,21 @@ C-c C-i Info menu C-c C-r Roster menu
C-c C-s Service menu
"))
(insert "__________________________________\n\n")
- (let ((map (make-sparse-keymap)))
- (define-key map [mouse-2] #'jabber-send-presence)
- (insert (jabber-propertize (concat (format " - %s"
- (cdr (assoc *jabber-current-show* jabber-presence-strings)))
- (if (not (zerop (length *jabber-current-status*)))
- (format " (%s)"
- (jabber-fix-status *jabber-current-status*)))
- " -")
- 'face (or (cdr (assoc *jabber-current-show* jabber-presence-faces))
- 'jabber-roster-user-online)
- ;;'mouse-face (cons 'background-color "light grey")
- 'keymap map)
- "\n"))
+ (if (null jabber-connections)
+ (insert "Not connected\n")
+ (let ((map (make-sparse-keymap)))
+ (define-key map [mouse-2] #'jabber-send-presence)
+ (insert (jabber-propertize (concat (format " - %s"
+ (cdr (assoc *jabber-current-show* jabber-presence-strings)))
+ (if (not (zerop (length *jabber-current-status*)))
+ (format " (%s)"
+ (jabber-fix-status *jabber-current-status*)))
+ " -")
+ 'face (or (cdr (assoc *jabber-current-show* jabber-presence-faces))
+ 'jabber-roster-user-online)
+ ;;'mouse-face (cons 'background-color "light grey")
+ 'keymap map)
+ "\n")))
(dolist (jc jabber-connections)
;; We sort everything before putting it in the ewoc