summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2013-02-19 23:43:39 +0100
committerGravatar Tom Willemsen2013-02-19 23:43:39 +0100
commit0fb047ba987a259a2cbb0bd327cea0c9b7cab63e (patch)
tree65ee844609499cb7f22ba550cfe34e5fc9cbe6c0
parent2e1315b829f0285cce05f305fc97993ac2890cf1 (diff)
downloaddotfiles-0fb047ba987a259a2cbb0bd327cea0c9b7cab63e.tar.gz
dotfiles-0fb047ba987a259a2cbb0bd327cea0c9b7cab63e.zip
emacs: Don't use avatars with jabber
-rw-r--r--emacs/init.el3
-rw-r--r--emacs/site-lisp/oni.el5
2 files changed, 4 insertions, 4 deletions
diff --git a/emacs/init.el b/emacs/init.el
index 816c03d..a3eff7b 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -119,6 +119,7 @@
(setq jabber-account-list '(("ryuslash@jabber.org")
("tom@ryuslash.org/Emacs"
(:connection-type . ssl))))
+(setq jabber-avatar-cache-directory "~/.emacs.d/jabber-avatars/")
(setq jabber-chat-buffer-format "*jab:%n*")
(setq jabber-chat-buffer-show-avatar nil)
(setq jabber-chat-fill-long-lines nil)
@@ -128,6 +129,8 @@
(setq jabber-history-dir "~/.emacs.d/jabber")
(setq jabber-muc-autojoin '("aethon@muc.ryuslash.org"))
(setq jabber-roster-show-bindings nil)
+(setq jabber-vcard-avatars-publish nil)
+(setq jabber-vcard-avatars-retrieve nil)
(setq jit-lock-defer-time 0.2)
(setq magit-repo-dirs '("~/projects/" "~/var/src/"))
(setq message-log-max 1000)
diff --git a/emacs/site-lisp/oni.el b/emacs/site-lisp/oni.el
index 80d1b01..9b2df64 100644
--- a/emacs/site-lisp/oni.el
+++ b/emacs/site-lisp/oni.el
@@ -189,10 +189,7 @@ If COUNT has been specified indent by that much, otherwise look at
(defun oni:jabber-chat-mode-func ()
"Function for `jabber-chat-mode-hook'."
- (visual-line-mode)
- (setq mode-line-format (append (cddr jabber-chat-header-line-format)
- '(global-mode-string))
- header-line-format nil))
+ (visual-line-mode))
(defun oni:jabber-init ()
"Initialization function for jabber."