[empathy: 12/12] Merge branch 'status-dialog'

[Will Thompson <wjt src gnome org>]

commit 3e22c794dd4568a69c08ce80cc12e03eb27f836c
Merge: ea70cf0 896aa85
Author: Will Thompson <will thompson collabora co uk>
Date:   Fri Jun 24 14:28:23 2011 +0100

    Merge branch 'status-dialog'
    
    Reviewed-by: Guillaume Desmottes <guillaume desmottes collabora co uk>

 libempathy-gtk/empathy-presence-chooser.c          |    3 -
 libempathy-gtk/empathy-status-preset-dialog.c      |  295 +++-----------------
 libempathy-gtk/empathy-status-preset-dialog.ui     |  136 +++-------
 .../test-empathy-status-preset-dialog.c            |    9 +-
 4 files changed, 75 insertions(+), 368 deletions(-)
---