[empathy: 26/26] Merge branch 'connman'

[Jonny Lamb <jonnylamb src gnome org>]

commit 900bb42ee52f895dd7c6ce252e7f6104968d1bf8
Merge: f6b001d... 3336ae4...
Author: Jonny Lamb <jonny lamb collabora co uk>
Date:   Thu Aug 20 14:44:10 2009 +0100

    Merge branch 'connman'

 configure.ac                              |   45 +++-
 data/empathy.schemas.in                   |    8 +-
 libempathy-gtk/empathy-conf.h             |    2 +-
 libempathy-gtk/empathy-presence-chooser.c |   26 ++
 libempathy/Makefile.am                    |    8 +-
 libempathy/empathy-connectivity.c         |  433 +++++++++++++++++++++++++++++
 libempathy/empathy-connectivity.h         |   71 +++++
 libempathy/empathy-debug.c                |    1 +
 libempathy/empathy-debug.h                |    1 +
 libempathy/empathy-idle.c                 |  158 +++--------
 libempathy/empathy-idle.h                 |    3 -
 src/empathy.c                             |   27 ++-
 12 files changed, 630 insertions(+), 153 deletions(-)
---