[empathy: 15/15] Merge branch 'requests'. Fixes: #598905

[Sjoerd Simons <sjoerds src gnome org>]

commit ed582f419d68c95dabfc26d4453c89d0d7f038a4
Merge: 81aeb65 0653070
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Wed Feb 24 20:14:24 2010 +0000

    Merge branch 'requests'. Fixes: #598905

 libempathy/empathy-dispatcher.c |  370 +++++++++++++++++++++++----------------
 libempathy/empathy-ft-handler.c |    2 +
 libempathy/empathy-handler.c    |   14 ++-
 libempathy/empathy-handler.h    |    2 +
 libempathy/empathy-utils.h      |    2 -
 src/empathy-debug-window.c      |    4 +-
 src/empathy.c                   |    2 +-
 7 files changed, 234 insertions(+), 162 deletions(-)
---