Commit Graph

33 Commits

Author SHA1 Message Date
Magnus Henoch fff33826f4 Use srv.el from package repository
srv.el is now a separate package in MELPA, so let's depend on that.

Keep a copy in jabber-fallback-lib for the time being.
2018-09-28 00:25:34 +01:00
Magnus Henoch d5bfa1c62e Prefer fsm.el from ELPA
fsm.el is now in GNU ELPA, so let's use it if it's installed.  Also,
let the jabber package depend on it.

Keep a copy in jabber-fallback-lib directory, and use it if necessary.
Notably, this one is still compatible with Emacs 23.
2015-10-25 23:04:12 +00:00
Evgenii Terechkov 5453338333 Typo in filename fixed 2014-06-20 16:25:23 +08:00
Evgenii Terechkov 15ea34d2d8 Notifications alerts by Adam Sjøgren (asjo@koldfront.dk) 2014-06-07 19:43:56 +08:00
Magnus Henoch ebce8529c3 Add jabber-rtt to Makefile.am 2013-11-26 20:09:48 +00:00
Magnus Henoch 3fc9296286 Merge jabber-newdisco into jabber-disco
The functionality is about to start overlapping.  Also, there wasn't
much sense in separating the two to begin with.
2013-11-25 23:36:12 +00:00
Magnus Henoch c335fc5b6a configure.ac to read version number from jabber-ourversion.el
...instead of the other way around.  This should make it possible to
build an ELPA-style package straight out of Git without running
autoconf, while we'd still be able to build tarballs through automake.
2013-07-27 20:00:50 +01:00
Magnus Henoch 2ac3550da7 Bump Automake required version to 1.11 for dist-xz option 2013-02-26 23:58:49 +00:00
Magnus Henoch 60ef84029b Improve treatment of hexrgb for ELPA package
Include hexrgb.el in jabber-fallback-lib subdirectory, in order not to
override any already installed version.
2013-02-26 10:48:07 +00:00
Magnus Henoch 2171eb029a Remove sha1.el and hex-util.el; fix hexrgb compilation
sha1.el was included in Emacs 22.1 (released in 2007) and has since
been replaced by native functions; there's no point in us including it
anymore.  hex-util.el was only used by sha1.el.

Newer versions of Automake (since 1.13) treat Emacs Lisp files in
subdirectories differently, which causes problems with hexrgb.el.  I
made it copy hexrgb.el into the top directory, and it seems to work
for me.

Update README.  New minimum version is 23.1, which is when dns.el
started supporting SRV queries.  (Still need to update TLS section.)
2013-01-28 01:34:04 +00:00
Michael Cardell Widerkrantz 295525b618 Add tmux alerts 2012-04-15 11:21:28 +01:00
Evgenii Terechkov 10c065380f Fix ELPA package creation
First, we don't know if it sha1/hex-util/hexrgb present on target
system, so install it anyway.

Second, add autoload cookie to normal loading of hexrgb.
2010-10-19 23:35:36 +08:00
Evgenii Terechkov e29b4e5a43 New feature: MUC's nick coloring. For HSV-based color generation,
http://www.emacswiki.org/emacs/hexrgb.el required (bundled version used, if not found).
Use assoc.el for alist handing (we use it in j-presence anyway).
2010-01-27 14:11:02 +03:00
Demyan Rogozhin 3855ca686e Add Jabber XML console.
Print all XMPP stanzas in buffer *-jabber-console-JID-*.
Arbitrary code can be manually sent to XML stream from this buffer.

Features:
* Use legacy `jabber-debug-log-xml' custom var to trigger console
* Print XML with indention and syntax highlight (sgml-mode required)
* Comments indicates sending/receiving/raw into console buffer
* Console buffer name is customizable, see `jabber-console-name-format'
* Console buffer truncated, see `jabber-console-truncate-lines'

Thanks to Evgenii Terechkov for features and tests.
2010-01-23 00:38:48 +03:00
Evgenii Terechkov 7c60a39917 Add jabber-libnotify.el to makefile 2009-10-03 14:56:45 +08:00
Evgenii Terechkov 2bd3e2367d Merge remote branch 'sf_upstream/master' into upstream
* sf_upstream/master:
  * emacs-jabber-uri-handler: Renamed from xmppuri.sh.
  Add .gitignore file
  * README (XMPP URIs): Mention the ideal case.
2009-09-13 04:53:27 +08:00
Magnus 929d4d92c3 * emacs-jabber-uri-handler: Renamed from xmppuri.sh.
* jabber.texi (XMPP URIs): s/xmppuri.sh/emacs-jabber-uri-handler/

* gconf/emacs-jabber.schemas.in:
s/xmppuri.sh/emacs-jabber-uri-handler/

* Makefile.am (dist_libexec_SCRIPTS):
s/xmppuri.sh/emacs-jabber-uri-handler/
2009-09-12 12:49:53 +01:00
Evgenii Terechkov 683d59c6a3 Add jabber-ping to distribution 2009-06-27 21:21:24 +08:00
Evgenii Terechkov b0126eac9e Revert "Merge branch 'master' of ssh://gitosis@catap.ru/emacs-jabber/emacs-jabber into upstream"
This reverts commit f0d736475e, reversing
changes made to fa9fcf5706.
2009-06-07 21:59:07 +08:00
Evgenii Terechkov 781d4fa118 Merge commit 'refs/heads/upstream'
* commit 'refs/heads/upstream': (25 commits)
  Try to delete all jid
  Add groups-old to jid
  Rewrite a sorting function
  Write to log symbol-name of jid
  Add jabber-roster-debug and missing new-items :)
  Don't store group node.
  Refactoring jabber-roster-update
  Roll up/down the groups by mouse-2
  Do not recreate roster-hash every time
  Define personal MUC hook with awesome
  Include jabber-awesome.el in Makefile
  Rename group by `e'
  Delete group by C-k
  Add comment to jabber-roster-ret-action-at-point
  Roll up/down the group in roster by RET
  jabber-awesome.el: initial revesion of Awesome window manager
  fix "- Online (Idle) -" in roster window
  `jabber-send-presence' refactored
  Fix sort of roster
  Recreate roster after every changes.
  ...
2009-04-29 19:56:35 +08:00
Evgenii Terechkov 3c2d104665 Include jabber-awesome.el in Makefile 2009-04-17 13:37:59 +08:00
Evgenii Terechkov dcca5497a1 Ressurect ALT-specific files after upstream merge 2009-04-12 15:07:33 +08:00
Evgenii Terechkov aa37ed6bae Cleanup upstream's master from ALT-specific files and revert alt-patch 2009-04-12 15:00:18 +08:00
Evgenii Terechkov 884a9fe486 0.8-alt1.20090323
- git-20090323
2009-03-23 23:04:34 +07:00
Magnus Henoch 77c652409f Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-612
Creator:  Magnus Henoch <mange@freemail.hu>

Install GConf schema for XMPP URI handler
2008-10-23 01:23:49 +00:00
Magnus Henoch e0d0c0f8b0 Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-540
Creator:  Magnus Henoch <mange@freemail.hu>

Clean up conditionally compiled elisp files
2008-06-17 14:51:04 +00:00
Magnus Henoch db18ce4415 Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-535
Creator:  Magnus Henoch <mange@freemail.hu>

Fix building of jabber-autoloads under Emacs 21

Also, ensure that it does (provide 'jabber-autoloads), which lets us use
`require'.
2008-06-17 14:49:20 +00:00
Magnus Henoch cef10e6a93 Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-520
Creator:  Magnus Henoch <mange@freemail.hu>

Explicitly require automake 1.9
2008-06-01 22:54:45 +00:00
Magnus Henoch 8b1147e3fa Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-514
Creator:  Magnus Henoch <mange@freemail.hu>

Put jabber-version variable in separate, automatically updated file
2008-05-30 21:56:56 +00:00
Magnus Henoch 32323089a1 Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-490
Creator:  Magnus Henoch <mange@freemail.hu>

_Really_ add jabber-pkg.el.in.  Don't distribute jabber-pkg.el in non-ELPA builds.
2008-04-25 18:52:09 +00:00
Magnus Henoch 2224da87da Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-484
Creator:  Magnus Henoch <mange@freemail.hu>

Rename jabber-autoload to jabber-autoloads.  Add elpa target.
2008-04-24 02:19:18 +00:00
Magnus Henoch 3897ddf044 Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-480
Creator:  Magnus Henoch <mange@freemail.hu>

Check for presence of elisp libraries, and include them if missing.  Make it compile with Emacs 21 and 22.
2008-04-20 11:44:07 +00:00
Magnus Henoch f2405e37e6 Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-479
Creator:  Magnus Henoch <mange@freemail.hu>

Merge autotools and test suite

Patches applied:

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--base-0
   tag of mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-477

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-1
   Add Makefile.am and configure.ac

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-2
   Don't require jabber-muc-nick-completion from jabber-alert, but add an autoload

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-3
   Require external notifiers from jabber.el, not jabber-alert.el

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-4
   External notifiers require jabber-alert when compiling

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-5
   Build autoloads

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-6
   Break lines in Makefile.am

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-7
   Rearrange Makefile.am to avoid circular dependency

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-8
   Remove unnecessary BUILT_SOURCES

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-9
   Add jabber.texi to Makefile.am

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-10
   Maintainer-clean jabber-autoload.el

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-11
   Distribute and install xmppuri.sh

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-12
   Create zip file too

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-13
   Remove explicit autoloads from jabber.el; add corresponding cookies

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-14
   Merge CDATA fix

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-15
   Add comment explaining double-compilation

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-16
   Add test suite

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-17
   Use subdirectory makefile for tests

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-18
   Distribute tests

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-19
   -Wall and -Werror for automake

 * mange@freemail.hu--2005/emacs-jabber--autotools--0--patch-20
   Use makefile variables instead of autoconf ones
2008-04-20 06:21:40 +00:00