[empathy: 4/4] Merge branch 'undo-close-tab'

[Jonny Lamb <jonnylamb src gnome org>]

commit 5d6902cc05f95832e06afd88b6d581be68c1a79f
Merge: 62a0fee d8dd568
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Tue Mar 30 14:48:31 2010 +0100

    Merge branch 'undo-close-tab'

 src/Makefile.am            |    1 +
 src/empathy-chat-manager.c |  253 ++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-chat-manager.h |   70 ++++++++++++
 src/empathy-chat-window.c  |   48 +++++++++
 src/empathy-chat-window.ui |    8 ++
 src/empathy-main-window.c  |   20 ++++
 src/empathy.c              |    6 +
 7 files changed, 406 insertions(+), 0 deletions(-)
---