Remove external notifiers from main file

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."

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
-
-

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"

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)
 

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)
 

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)) "

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"

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"

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

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.

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.")

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