diff --git a/jabber-awesome.el b/jabber-awesome.el index 692e673..4112a12 100644 --- a/jabber-awesome.el +++ b/jabber-awesome.el @@ -18,7 +18,7 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (defcustom jabber-awesome-args ", timeout=5" "Additional args to naughty." diff --git a/jabber-festival.el b/jabber-festival.el index 07f25d5..64b93e9 100644 --- a/jabber-festival.el +++ b/jabber-festival.el @@ -19,7 +19,7 @@ ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (condition-case e (progn @@ -31,5 +31,3 @@ (provide 'jabber-festival) ;; arch-tag: 8922D096-5D07-11D9-B4C2-000A95C2FCD0 - - diff --git a/jabber-libnotify.el b/jabber-libnotify.el index bf4d44c..326e6e7 100644 --- a/jabber-libnotify.el +++ b/jabber-libnotify.el @@ -18,7 +18,7 @@ ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (require 'dbus nil t) -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (defcustom jabber-libnotify-icon "" "Icon to be used on the notification pop-up. Default is empty" diff --git a/jabber-notifications.el b/jabber-notifications.el index cb7963b..b780b9e 100644 --- a/jabber-notifications.el +++ b/jabber-notifications.el @@ -20,7 +20,7 @@ ;; Built on jabber-libnotify.el. -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (unless (string< emacs-version "24.1") ;notifications.el preset since Emacs 24.1 (require 'notifications) diff --git a/jabber-ratpoison.el b/jabber-ratpoison.el index 8ac05a1..09d5516 100644 --- a/jabber-ratpoison.el +++ b/jabber-ratpoison.el @@ -18,7 +18,7 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (defun jabber-ratpoison-message (text &optional title) "Show MSG in Ratpoison" @@ -27,7 +27,7 @@ (let ((process-connection-type)) (call-process "ratpoison" nil 0 nil "-c" (concat "echo " (or title text)))) (error nil))) - + (define-jabber-alert ratpoison "Show a message through the Ratpoison window manager" 'jabber-ratpoison-message) diff --git a/jabber-sawfish.el b/jabber-sawfish.el index 3cc7a5a..5262d5e 100644 --- a/jabber-sawfish.el +++ b/jabber-sawfish.el @@ -18,7 +18,7 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (defcustom jabber-sawfish-display-time 3 "Time in seconds for displaying a jabber message through the @@ -29,8 +29,8 @@ Sawfish window manager." (defun jabber-sawfish-display-message (text &optional title) "Displays MESSAGE through the Sawfish window manager." (let ((process-connection-type nil)) - (start-process-shell-command - "jabber-sawfish" nil "echo" + (start-process-shell-command + "jabber-sawfish" nil "echo" (concat "'(progn (require (quote timers)) (display-message \"" (or title text) "\")(make-timer (lambda () (display-message nil)) " diff --git a/jabber-screen.el b/jabber-screen.el index b6f5ae5..a2a209e 100644 --- a/jabber-screen.el +++ b/jabber-screen.el @@ -18,7 +18,7 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (defun jabber-screen-message (text &optional title) "Show MSG in screen" diff --git a/jabber-tmux.el b/jabber-tmux.el index 379f839..1c8decb 100644 --- a/jabber-tmux.el +++ b/jabber-tmux.el @@ -18,7 +18,7 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (defun jabber-tmux-message (msg) "Show MSG in tmux" diff --git a/jabber-wmii.el b/jabber-wmii.el index f0b1a9b..6faf365 100644 --- a/jabber-wmii.el +++ b/jabber-wmii.el @@ -18,7 +18,7 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (defvar jabber-wmii-color "#ffffff #335577 #447799" "Color specification as needed by the wmii window manager for the jabber alert messages.") @@ -34,7 +34,7 @@ (condition-case e (call-process "wmiir" nil nil nil "remove" "/rbar/jabber") (error nil))) - + (defun jabber-wmii-message (text &optional title) "Show MSG in wmii." (when jabber-wmii-timer diff --git a/jabber-xmessage.el b/jabber-xmessage.el index cf942d5..8bf8a68 100644 --- a/jabber-xmessage.el +++ b/jabber-xmessage.el @@ -19,7 +19,7 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(eval-when-compile (require 'jabber-alert)) +(eval-when-compile (require 'jabber)) (defcustom jabber-xmessage-timeout 15 "Timeout in seconds for xmessage alerts. diff --git a/jabber.el b/jabber.el index f39777a..7453a5b 100644 --- a/jabber.el +++ b/jabber.el @@ -13153,20 +13153,6 @@ configure a Google Talk account like this: :type 'integer :group 'jabber) -;;; guess internal dependencies! - -;; External notifiers -(require 'jabber-screen) -(require 'jabber-tmux) -(require 'jabber-ratpoison) -(require 'jabber-sawfish) -(require 'jabber-festival) -(require 'jabber-xmessage) -(require 'jabber-wmii) -(require 'jabber-osd) -(require 'jabber-awesome) -(require 'jabber-libnotify) -(require 'jabber-notifications) ;;;###autoload (defvar *jabber-current-status* nil "The users current presence status.") diff --git a/jabber.org b/jabber.org index 5674a77..d5c71df 100644 --- a/jabber.org +++ b/jabber.org @@ -16665,20 +16665,6 @@ configure a Google Talk account like this: :type 'integer :group 'jabber) -;;; guess internal dependencies! - -;; External notifiers -(require 'jabber-screen) -(require 'jabber-tmux) -(require 'jabber-ratpoison) -(require 'jabber-sawfish) -(require 'jabber-festival) -(require 'jabber-xmessage) -(require 'jabber-wmii) -(require 'jabber-osd) -(require 'jabber-awesome) -(require 'jabber-libnotify) -(require 'jabber-notifications) #+END_SRC **** *jabber-current-status* :variable: #+BEGIN_SRC emacs-lisp