[empathy: 26/26] Merge branch 'irc-widget-588243'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893
Merge: f7a63b4 e624601
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Aug 26 14:03:11 2010 +0200

    Merge branch 'irc-widget-588243'

 libempathy-gtk/Makefile.am                         |    4 +
 libempathy-gtk/empathy-account-widget-irc.c        |  403 +------------
 libempathy-gtk/empathy-account-widget-irc.ui       |   78 +---
 .../empathy-irc-network-chooser-dialog.c           |  629 ++++++++++++++++++++
 .../empathy-irc-network-chooser-dialog.h           |   71 +++
 libempathy-gtk/empathy-irc-network-chooser.c       |  360 +++++++++++
 libempathy-gtk/empathy-irc-network-chooser.h       |   61 ++
 libempathy/empathy-irc-network-manager.c           |   34 +
 libempathy/empathy-irc-network-manager.h           |    2 +
 libempathy/empathy-irc-network.c                   |   16 +
 libempathy/empathy-irc-network.h                   |    4 +
 11 files changed, 1204 insertions(+), 458 deletions(-)
---