diff options
| author |  Tom Willemse | 2016-02-09 11:00:18 +0100 |
|---|---|---|
| committer | Tom Willemse | 2016-02-09 11:00:18 +0100 |
| commit | e44cd1286189e7c45de81776263650e03c6af559 (patch) | |
| tree | f441ea257805a116b15e0fdfe1042c0f6fa1ac46 /emacs | |
| parent | 2a2255787c701b6b9e40658def722b5edfd700ba (diff) | |
| download | dotfiles-e44cd1286189e7c45de81776263650e03c6af559.tar.gz dotfiles-e44cd1286189e7c45de81776263650e03c6af559.zip | |
Cleanup jabber-init
- Add proper requirements to fix compiler warnings.
- Remove old stumpwm notification functions.
- Add dukgo jabber account.
- Remove old work gmail account.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/site-lisp/jabber-init.el | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/emacs/.emacs.d/site-lisp/jabber-init.el b/emacs/.emacs.d/site-lisp/jabber-init.el index e95799d..928c676 100644 --- a/emacs/.emacs.d/site-lisp/jabber-init.el +++ b/emacs/.emacs.d/site-lisp/jabber-init.el @@ -5,6 +5,9 @@ ;; (autoload 'jabber-message-libnotify "jabber-libnotify") ;; (autoload 'jabber-muc-libnotify "jabber-libnotify") +(require 'jabber) +(require 'jabber-margin-prompts) + (defun jabber-init-roster-mode-func () "Function for `jabber-roster-mode-hook'." (setq mode-line-format @@ -23,16 +26,11 @@ Insert PROPOSED-ALERT in the buffer if it is non-nil." (ewoc-enter-last jabber-chat-ewoc (list :notice proposed-alert :time (current-time))))))) -(defun jabber-init-stumpwm-echo (from buffer text title) - "Use stumpwm to echo a message has arrived." - (oni:stumpwm-echo title)) - -(defun jabber-init-stumpwm-echo-muc (nick group buffer text title) - "Use stumpwm to echo a message has arrived." - (oni:stumpwm-echo title)) - -(setq jabber-account-list `((,(concat "tom@ryuslash.org/" system-name) - (:connection-type . starttls)))) +(setq jabber-account-list + `((,(concat "tom@ryuslash.org/" (system-name)) + (:connection-type . starttls)) + (,(concat "ryuslash@dukgo.com/" (system-name)) + (:connection-type . starttls)))) (setq jabber-avatar-cache-directory "~/.emacs.d/jabber-avatars/" jabber-chat-buffer-format "+%n" @@ -59,10 +57,6 @@ Insert PROPOSED-ALERT in the buffer if it is non-nil." jabber-vcard-avatars-publish nil jabber-vcard-avatars-retrieve nil) -(add-to-list 'jabber-account-list - `(,(concat "thomas@aethon.nl/" system-name) - (:network-server . "talk.google.com") - (:connection-type . ssl))) (add-hook 'jabber-alert-message-hooks #'jabber-message-libnotify) (add-hook 'jabber-alert-muc-hooks #'jabber-muc-libnotify) |