From 3bdfffd9f4d0b74423d8a10b788544e1737bf55f Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Wed, 31 Aug 2005 20:10:15 +0000 Subject: Remove external-notifiers and move files to main directory --- external-notifiers/jabber-festival.el | 33 ---------------------------- external-notifiers/jabber-ratpoison.el | 34 ----------------------------- external-notifiers/jabber-sawfish.el | 40 ---------------------------------- external-notifiers/jabber-screen.el | 29 ------------------------ external-notifiers/jabber-xmessage.el | 30 ------------------------- jabber-alert.el | 12 +++++----- jabber-festival.el | 33 ++++++++++++++++++++++++++++ jabber-ratpoison.el | 34 +++++++++++++++++++++++++++++ jabber-sawfish.el | 40 ++++++++++++++++++++++++++++++++++ jabber-screen.el | 29 ++++++++++++++++++++++++ jabber-xmessage.el | 30 +++++++++++++++++++++++++ 11 files changed, 172 insertions(+), 172 deletions(-) delete mode 100644 external-notifiers/jabber-festival.el delete mode 100644 external-notifiers/jabber-ratpoison.el delete mode 100644 external-notifiers/jabber-sawfish.el delete mode 100644 external-notifiers/jabber-screen.el delete mode 100644 external-notifiers/jabber-xmessage.el create mode 100644 jabber-festival.el create mode 100644 jabber-ratpoison.el create mode 100644 jabber-sawfish.el create mode 100644 jabber-screen.el create mode 100644 jabber-xmessage.el diff --git a/external-notifiers/jabber-festival.el b/external-notifiers/jabber-festival.el deleted file mode 100644 index 23b0b96..0000000 --- a/external-notifiers/jabber-festival.el +++ /dev/null @@ -1,33 +0,0 @@ -;;; jabber-festival.el --- Festival alert hooks - -;; Copyright (C) 2005 Magnus Henoch - -;; This file is a part of jabber.el. - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. - -(condition-case e - (progn - ;; Most people don't have Festival, so this will often fail - (require 'festival) - (define-jabber-alert festival "Voice messages through Festival" - 'festival-say-string)) - (error nil)) - -(provide 'jabber-festival) -;; arch-tag: 8922D096-5D07-11D9-B4C2-000A95C2FCD0 - - diff --git a/external-notifiers/jabber-ratpoison.el b/external-notifiers/jabber-ratpoison.el deleted file mode 100644 index 141f290..0000000 --- a/external-notifiers/jabber-ratpoison.el +++ /dev/null @@ -1,34 +0,0 @@ -;; jabber-ratpoison.el - emacs-jabber interface to ratpoison - -;; Copyright (C) 2005 - Magnus Henoch - mange@freemail.hu - -;; This file is a part of jabber.el. - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(defun jabber-ratpoison-message (msg) - "Show MSG in Ratpoison" - ;; Possible errors include not finding the ratpoison binary, and - ;; too many pipes open because of message flood. - (condition-case e - (let ((process-connection-type)) - (start-process "ratpoison" nil "ratpoison" "-c" (concat "echo " msg))) - (error nil))) - -(define-jabber-alert ratpoison "Show a message through the Ratpoison window manager" - 'jabber-ratpoison-message) - -(provide 'jabber-ratpoison) -;; arch-tag: 19650075-5D05-11D9-B80F-000A95C2FCD0 diff --git a/external-notifiers/jabber-sawfish.el b/external-notifiers/jabber-sawfish.el deleted file mode 100644 index 378eb20..0000000 --- a/external-notifiers/jabber-sawfish.el +++ /dev/null @@ -1,40 +0,0 @@ -;; jabber-sawfish.el - emacs-jabber interface to sawfish - -;; Copyright (C) 2005 - Mario Domenech Goulart - -;; This file is a part of jabber.el. - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(defcustom jabber-sawfish-display-time 3 - "Time in seconds for displaying a jabber message through the -Sawfish window manager." - :type 'integer - :group 'jabber-alerts) - -(defun jabber-sawfish-display-message (message) - "Displays MESSAGE through the Sawfish window manager." - (let ((process-connection-type nil)) - (start-process-shell-command - "jabber-sawfish" nil "echo" - (concat "'(progn (display-message \"" - message - "\")(make-timer (lambda () (display-message nil)) 3))' | sawfish-client - &> /dev/null")))) - -(define-jabber-alert sawfish "Display a message through the Sawfish window manager" - 'jabber-sawfish-display-message) - -(provide 'jabber-sawfish) -;; arch-tag: 4F0154ED-5D05-11D9-9E6B-000A95C2FCD0 diff --git a/external-notifiers/jabber-screen.el b/external-notifiers/jabber-screen.el deleted file mode 100644 index 7b00320..0000000 --- a/external-notifiers/jabber-screen.el +++ /dev/null @@ -1,29 +0,0 @@ -;; jabber-screen.el - emacs-jabber interface to screen - -;; Copyright (C) 2005 - Magnus Henoch - mange@freemail.hu - -;; This file is a part of jabber.el. - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(defun jabber-screen-message (msg) - "Show MSG in screen" - (call-process "screen" nil nil nil "-X" "echo" msg)) - -(define-jabber-alert screen "Show a message through the Screen terminal manager" - 'jabber-screen-message) - -(provide 'jabber-screen) -;; arch-tag: B576ADDA-5D04-11D9-AA52-000A95C2FCD0 diff --git a/external-notifiers/jabber-xmessage.el b/external-notifiers/jabber-xmessage.el deleted file mode 100644 index f15334d..0000000 --- a/external-notifiers/jabber-xmessage.el +++ /dev/null @@ -1,30 +0,0 @@ -;; jabber-xmessage.el - emacs-jabber interface to xmessage - -;; Copyright (C) 2005 - Mario Domenech Goulart - -;; This file is a part of jabber.el. - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program; if not, write to the Free Software -;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -(defun jabber-xmessage-display-message (message) - "Displays MESSAGE using the xmessage program." - (let ((process-connection-type nil)) - (start-process "xmessage" nil "xmessage" message))) - -(define-jabber-alert xmessage "Display a message using the xmessage program." - 'jabber-xmessage-display-message) - -(provide 'jabber-xmessage) -;; arch-tag: 10A74D00-5D2C-11D9-A294-000A95C2FCD0 diff --git a/jabber-alert.el b/jabber-alert.el index 0c8c2ca..5709e14 100644 --- a/jabber-alert.el +++ b/jabber-alert.el @@ -256,12 +256,12 @@ Examples: (define-jabber-alert beep "Beep on event" (lambda (&rest ignore) (beep))) -;; XXX: ugly subdirectory hack -(require 'jabber-screen "external-notifiers/jabber-screen") -(require 'jabber-ratpoison "external-notifiers/jabber-ratpoison") -(require 'jabber-sawfish "external-notifiers/jabber-sawfish") -(require 'jabber-festival "external-notifiers/jabber-festival") -(require 'jabber-xmessage "external-notifiers/jabber-xmessage") +;; External notifiers +(require 'jabber-screen) +(require 'jabber-ratpoison) +(require 'jabber-sawfish) +(require 'jabber-festival) +(require 'jabber-xmessage) ;; Message alert hooks (defun jabber-message-default-message (from buffer text) diff --git a/jabber-festival.el b/jabber-festival.el new file mode 100644 index 0000000..23b0b96 --- /dev/null +++ b/jabber-festival.el @@ -0,0 +1,33 @@ +;;; jabber-festival.el --- Festival alert hooks + +;; Copyright (C) 2005 Magnus Henoch + +;; This file is a part of jabber.el. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +(condition-case e + (progn + ;; Most people don't have Festival, so this will often fail + (require 'festival) + (define-jabber-alert festival "Voice messages through Festival" + 'festival-say-string)) + (error nil)) + +(provide 'jabber-festival) +;; arch-tag: 8922D096-5D07-11D9-B4C2-000A95C2FCD0 + + diff --git a/jabber-ratpoison.el b/jabber-ratpoison.el new file mode 100644 index 0000000..141f290 --- /dev/null +++ b/jabber-ratpoison.el @@ -0,0 +1,34 @@ +;; jabber-ratpoison.el - emacs-jabber interface to ratpoison + +;; Copyright (C) 2005 - Magnus Henoch - mange@freemail.hu + +;; This file is a part of jabber.el. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program; if not, write to the Free Software +;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +(defun jabber-ratpoison-message (msg) + "Show MSG in Ratpoison" + ;; Possible errors include not finding the ratpoison binary, and + ;; too many pipes open because of message flood. + (condition-case e + (let ((process-connection-type)) + (start-process "ratpoison" nil "ratpoison" "-c" (concat "echo " msg))) + (error nil))) + +(define-jabber-alert ratpoison "Show a message through the Ratpoison window manager" + 'jabber-ratpoison-message) + +(provide 'jabber-ratpoison) +;; arch-tag: 19650075-5D05-11D9-B80F-000A95C2FCD0 diff --git a/jabber-sawfish.el b/jabber-sawfish.el new file mode 100644 index 0000000..378eb20 --- /dev/null +++ b/jabber-sawfish.el @@ -0,0 +1,40 @@ +;; jabber-sawfish.el - emacs-jabber interface to sawfish + +;; Copyright (C) 2005 - Mario Domenech Goulart + +;; This file is a part of jabber.el. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program; if not, write to the Free Software +;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +(defcustom jabber-sawfish-display-time 3 + "Time in seconds for displaying a jabber message through the +Sawfish window manager." + :type 'integer + :group 'jabber-alerts) + +(defun jabber-sawfish-display-message (message) + "Displays MESSAGE through the Sawfish window manager." + (let ((process-connection-type nil)) + (start-process-shell-command + "jabber-sawfish" nil "echo" + (concat "'(progn (display-message \"" + message + "\")(make-timer (lambda () (display-message nil)) 3))' | sawfish-client - &> /dev/null")))) + +(define-jabber-alert sawfish "Display a message through the Sawfish window manager" + 'jabber-sawfish-display-message) + +(provide 'jabber-sawfish) +;; arch-tag: 4F0154ED-5D05-11D9-9E6B-000A95C2FCD0 diff --git a/jabber-screen.el b/jabber-screen.el new file mode 100644 index 0000000..7b00320 --- /dev/null +++ b/jabber-screen.el @@ -0,0 +1,29 @@ +;; jabber-screen.el - emacs-jabber interface to screen + +;; Copyright (C) 2005 - Magnus Henoch - mange@freemail.hu + +;; This file is a part of jabber.el. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program; if not, write to the Free Software +;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +(defun jabber-screen-message (msg) + "Show MSG in screen" + (call-process "screen" nil nil nil "-X" "echo" msg)) + +(define-jabber-alert screen "Show a message through the Screen terminal manager" + 'jabber-screen-message) + +(provide 'jabber-screen) +;; arch-tag: B576ADDA-5D04-11D9-AA52-000A95C2FCD0 diff --git a/jabber-xmessage.el b/jabber-xmessage.el new file mode 100644 index 0000000..f15334d --- /dev/null +++ b/jabber-xmessage.el @@ -0,0 +1,30 @@ +;; jabber-xmessage.el - emacs-jabber interface to xmessage + +;; Copyright (C) 2005 - Mario Domenech Goulart + +;; This file is a part of jabber.el. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program; if not, write to the Free Software +;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +(defun jabber-xmessage-display-message (message) + "Displays MESSAGE using the xmessage program." + (let ((process-connection-type nil)) + (start-process "xmessage" nil "xmessage" message))) + +(define-jabber-alert xmessage "Display a message using the xmessage program." + 'jabber-xmessage-display-message) + +(provide 'jabber-xmessage) +;; arch-tag: 10A74D00-5D2C-11D9-A294-000A95C2FCD0 -- cgit v1.2.3