gossip r2170 - in trunk: . libgossip protocols protocols/jabber protocols/telepathy src

[xclaesse svn gnome org]

Author: xclaesse
Date: 2007-01-11 19:54:02 +0000 (Thu, 11 Jan 2007)
New Revision: 2170
ViewCVS link: http://svn.gnome.org/viewcvs/gossip?rev=2170&view=rev

Added:
   trunk/protocols/telepathy/
   trunk/protocols/telepathy/Makefile.am
   trunk/protocols/telepathy/gossip-telepathy-chatrooms.c
   trunk/protocols/telepathy/gossip-telepathy-chatrooms.h
   trunk/protocols/telepathy/gossip-telepathy-cmgr.c
   trunk/protocols/telepathy/gossip-telepathy-cmgr.h
   trunk/protocols/telepathy/gossip-telepathy-contact-list.c
   trunk/protocols/telepathy/gossip-telepathy-contact-list.h
   trunk/protocols/telepathy/gossip-telepathy-contacts.c
   trunk/protocols/telepathy/gossip-telepathy-contacts.h
   trunk/protocols/telepathy/gossip-telepathy-group.c
   trunk/protocols/telepathy/gossip-telepathy-group.h
   trunk/protocols/telepathy/gossip-telepathy-message.c
   trunk/protocols/telepathy/gossip-telepathy-message.h
   trunk/protocols/telepathy/gossip-telepathy-private.h
   trunk/protocols/telepathy/gossip-telepathy.c
   trunk/protocols/telepathy/gossip-telepathy.h
   trunk/src/gossip-protocol-chooser.c
   trunk/src/gossip-protocol-chooser.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/libgossip/Makefile.am
   trunk/libgossip/gossip-account-manager.c
   trunk/libgossip/gossip-account.c
   trunk/libgossip/gossip-account.dtd
   trunk/libgossip/gossip-account.h
   trunk/libgossip/gossip-protocol.c
   trunk/protocols/Makefile.am
   trunk/protocols/jabber/gossip-jabber.c
   trunk/src/Makefile.am
   trunk/src/gossip-account-widget-jabber.c
   trunk/src/gossip-accounts-dialog.c
Log:
2006-01-11  Xavier Claessens  <xclaesse gmail com>

	*  Merged TELEPATHY branch to TRUNK. Fixes bug #391284.
	Thanks to all contributors (Xavier Claessens, Eitan Isaacson,
	Raphael Slinckx, Sjoerd Simons).